diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>
diff --git a/casic-web/src/main/build/bin/deploy.sh b/casic-web/src/main/build/bin/deploy.sh
new file mode 100644
index 0000000..f774749
--- /dev/null
+++ b/casic-web/src/main/build/bin/deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+ID=`lsof -i | grep 5903 | awk '{print $2}'`
+echo The process pid is $ID
+for id in $ID
+do
+    kill -9 $id
+    echo killed $id
+done
+cd /home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/
+nohup java -jar ./lib/casic-web-2.0.0.jar > /dev/null 2>&1 &
+exit 0
\ No newline at end of file

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>
diff --git a/casic-web/src/main/build/bin/deploy.sh b/casic-web/src/main/build/bin/deploy.sh
new file mode 100644
index 0000000..f774749
--- /dev/null
+++ b/casic-web/src/main/build/bin/deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+ID=`lsof -i | grep 5903 | awk '{print $2}'`
+echo The process pid is $ID
+for id in $ID
+do
+    kill -9 $id
+    echo killed $id
+done
+cd /home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/
+nohup java -jar ./lib/casic-web-2.0.0.jar > /dev/null 2>&1 &
+exit 0
\ No newline at end of file
diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh
index c00b1ef..562149f 100644
--- a/casic-web/src/main/build/bin/start.sh
+++ b/casic-web/src/main/build/bin/start.sh
@@ -1,2 +1 @@
-java -jar ./lib/${project.build.finalName}.jar
-
+java -jar ./lib/${project.build.finalName}.jar
\ No newline at end of file

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>
diff --git a/casic-web/src/main/build/bin/deploy.sh b/casic-web/src/main/build/bin/deploy.sh
new file mode 100644
index 0000000..f774749
--- /dev/null
+++ b/casic-web/src/main/build/bin/deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+ID=`lsof -i | grep 5903 | awk '{print $2}'`
+echo The process pid is $ID
+for id in $ID
+do
+    kill -9 $id
+    echo killed $id
+done
+cd /home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/
+nohup java -jar ./lib/casic-web-2.0.0.jar > /dev/null 2>&1 &
+exit 0
\ No newline at end of file
diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh
index c00b1ef..562149f 100644
--- a/casic-web/src/main/build/bin/start.sh
+++ b/casic-web/src/main/build/bin/start.sh
@@ -1,2 +1 @@
-java -jar ./lib/${project.build.finalName}.jar
-
+java -jar ./lib/${project.build.finalName}.jar
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index c45059a..71f5a17 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -32,7 +32,7 @@
 #   redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
 casic:
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
+  no-login-urls: /**/**,${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
   #flowable数据源和多数据源配置
   db:
     init:

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>
diff --git a/casic-web/src/main/build/bin/deploy.sh b/casic-web/src/main/build/bin/deploy.sh
new file mode 100644
index 0000000..f774749
--- /dev/null
+++ b/casic-web/src/main/build/bin/deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+ID=`lsof -i | grep 5903 | awk '{print $2}'`
+echo The process pid is $ID
+for id in $ID
+do
+    kill -9 $id
+    echo killed $id
+done
+cd /home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/
+nohup java -jar ./lib/casic-web-2.0.0.jar > /dev/null 2>&1 &
+exit 0
\ No newline at end of file
diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh
index c00b1ef..562149f 100644
--- a/casic-web/src/main/build/bin/start.sh
+++ b/casic-web/src/main/build/bin/start.sh
@@ -1,2 +1 @@
-java -jar ./lib/${project.build.finalName}.jar
-
+java -jar ./lib/${project.build.finalName}.jar
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index c45059a..71f5a17 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -32,7 +32,7 @@
 #   redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
 casic:
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
+  no-login-urls: /**/**,${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
   #flowable数据源和多数据源配置
   db:
     init:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 4257032..5ac56ad 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -7,8 +7,8 @@
     active: dev
   servlet:
     multipart:
-      max-file-size: 50MB
-      max-request-size: 80MB
+      max-file-size: 100MB
+      max-request-size: 100MB
 #mybatis-plus:
 #    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
 ###################  mybatis-plus配置  ###################

diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index 7e35b9f..ffd86ee 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,6 +15,17 @@
     <name>casic-server</name>
     <description>casic 的spring boot版本</description>
 
+    <properties>
+        <!--服务器项目运行的地址-->
+        <service-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/lib/</service-path>
+        <sh-path>/home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/deploy.sh</sh-path>
+        <pack-name>${project.artifactId}-${project.version}.jar</pack-name>
+        <!--ssh登录服务器的ip和端口 端口一般默认22-->
+        <remote-addr>111.198.10.15:21402</remote-addr>
+        <remote-username>admin</remote-username>
+        <remote-passwd>Casic203</remote-passwd>
+    </properties>
+
     <dependencies>
         <!--基础包依赖-->
         <dependency>
@@ -113,6 +124,12 @@
             <artifactId>oshi-core</artifactId>
             <version>5.7.0</version>
         </dependency>
+        <!--自动化部署-->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -129,5 +146,38 @@
                 </includes>
             </resource>
         </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.8</version>
+            </extension>
+        </extensions>
+        <!--自动化部署配置-->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fromFile>target/${pack-name}</fromFile>
+                    <url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
+                    <!-- 在服务器执行的命令集合 -->
+                    <commands>
+<!--                        &lt;!&ndash; 杀死原来的jar进程 &ndash;&gt;-->
+<!--                        <command>pkill -f ${pack-name}</command>-->
+<!--                        &lt;!&ndash; 重新启动jar进程，程序的输出结果写到log文件中 &ndash;&gt;-->
+<!--                        <command><![CDATA[nohup java -jar ${service-path}/${pack-name} > /dev/null 2>&1 & ]]></command>-->
+<!--                        &lt;!&ndash; netstat -nptl 可返回进程名字&ndash;&gt;-->
+<!--                        <command><![CDATA[netstat -nptl]]></command>-->
+<!--                        <command><![CDATA[ps -ef | grep java | grep -v grep]]></command>-->
+                        <command>sh ${sh-path}</command>
+                    </commands>
+                    <!-- 显示运行命令的输出结果 -->
+                    <displayCommandOutputs>true</displayCommandOutputs>
+                </configuration>
+
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
index 2e438a1..0168427 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceInfoController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,10 +38,20 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(busDeviceInfo);
         Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busDeviceInfos);
+        return ResponseData.success(super.packForBT(pages));
+    }
+
+    /**
+     * 设备列表（不分页）
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(@RequestBody BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
+        return ResponseData.success(busDeviceInfos);
     }
 
     /**
@@ -61,9 +72,7 @@
     @PostMapping("/listExport")
     @ResponseBody
     public void export(@RequestBody BusDeviceInfo busDeviceInfo) throws IOException {
-        Page<BusDeviceInfo> page = PageFactory.defaultPage();
-        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoListPage(page, busDeviceInfo);
-        page.setRecords(busDeviceInfos);
+        List<BusDeviceInfo> busDeviceInfos = busDeviceInfoService.getDeviceInfoList(busDeviceInfo);
         super.exportExcel(BusDeviceInfo.class, busDeviceInfos, ExportEnum.DEVICE_EXPORT.getFileName());
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
index 6546fdf..58f966d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java
@@ -1,17 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.IBusDistributorInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -26,6 +32,8 @@
 public class BusDistributorInfoController extends ExportController {
     @Autowired
     private IBusDistributorInfoService distributorInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 经销商列表（分页）
@@ -68,6 +76,9 @@
     public Object certificateDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailCertificate detailCertificate = distributorInfoService.getDistributorCertificateDetail(distributorCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -79,6 +90,14 @@
     public Object personDetail(@RequestBody BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         BusDetailPerson detailPerson = distributorInfoService.getDistributorPersonDetail(distributorCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -88,7 +107,12 @@
     @PostMapping("/business/detail")
     @ResponseBody
     public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) {
-        BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        DetailBusinessResponse detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -101,4 +125,14 @@
         return distributorInfoService.add(distributorInfoAddRequest);
     }
 
+    /**
+     * 经销商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusDistributorInfo distributorInfo) throws IOException {
+        List<DistributorInfoListResponse> distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo);
+        super.exportExcel(DistributorInfoListResponse.class, distributorInfoList, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
index 724ad93..2b8acb8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) {
+        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(annualAssess);
         Page<BusSupplierAnnualAssess> page = PageFactory.defaultPage();
-        List<BusSupplierAnnualAssess> annualAssessInfoList = annualAssessService.getAnnualAssessInfoListPage(page, annualAssess);
-        page.setRecords(annualAssessInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), annualAssessInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
index 7d8dbff..7ec7cb0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java
@@ -1,20 +1,25 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.*;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.enums.ExportEnum;
+import com.casic.missiles.modular.system.enums.SmartKitchenDict;
+import com.casic.missiles.modular.system.model.BusDetailCertificate;
+import com.casic.missiles.modular.system.model.BusDetailPerson;
+import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.service.IBusSupplierInfoService;
 import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -29,6 +34,8 @@
 public class BusSupplierInfoController extends ExportController {
     @Autowired
     private IBusSupplierInfoService supplierInfoService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 供应商列表（分页）
@@ -71,6 +78,9 @@
     public Object certificateDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailCertificate detailCertificate = supplierInfoService.getSupplierCertificateDetail(supplierCode);
+        if(!Objects.isNull(detailCertificate)){
+            detailCertificate.setTaxpayerNatureName(dictService.getDictNameByCode(SmartKitchenDict.TAXPAYER_NATURE, detailCertificate.getTaxpayerNature()));
+        }
         return ResponseData.success(detailCertificate);
     }
 
@@ -82,6 +92,14 @@
     public Object personDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         BusDetailPerson detailPerson = supplierInfoService.getSupplierPersonDetail(supplierCode);
+        if(!Objects.isNull(detailPerson)){
+            detailPerson.setLegalPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getLegalPersonCertificateType()));
+            detailPerson.setBusinessLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBusinessLeaderCertificateType()));
+            detailPerson.setBackupPersonCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getBackupPersonCertificateType()));
+            detailPerson.setTechnicalLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getTechnicalLeaderCertificateType()));
+            detailPerson.setSaleLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getSaleLeaderCertificateType()));
+            detailPerson.setFinanceLeaderCertificateTypeName(dictService.getDictNameByCode(SmartKitchenDict.LEGAL_PERSON_CERTIFICATE_TYPE, detailPerson.getFinanceLeaderCertificateType()));
+        }
         return ResponseData.success(detailPerson);
     }
 
@@ -92,7 +110,12 @@
     @ResponseBody
     public Object businessDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
-        BusDetailBusiness detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        DetailBusinessResponse detailBusiness = supplierInfoService.getSupplierBusinessDetail(supplierCode);
+        if(!Objects.isNull(detailBusiness)){
+            detailBusiness.setBusinessTypeName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_TYPE, detailBusiness.getBusinessType()));
+            detailBusiness.setBusinessNatureName(dictService.getDictNameByCode(SmartKitchenDict.BUSINESS_NATURE, detailBusiness.getBusinessNature()));
+            detailBusiness.setOfficeNatureName(dictService.getDictNameByCode(SmartKitchenDict.OFFICE_NATURE, detailBusiness.getOfficeNature()));
+        }
         return ResponseData.success(detailBusiness);
     }
 
@@ -104,6 +127,10 @@
     public Object reviewDetail(@RequestBody BusSupplierInfo busSupplierInfo) {
         String supplierCode = busSupplierInfo.getSupplierCode();
         SupplierInfoReviewDetailResponse reviewDetailResponse = supplierInfoService.getSupplierReviewDetail(supplierCode);
+        if(!Objects.isNull(reviewDetailResponse)){
+            reviewDetailResponse.setPreReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getPreReviewResult()));
+            reviewDetailResponse.setInputReviewResultName(dictService.getDictNameByCode(SmartKitchenDict.SUPPLIER_REVIEW_STATUS, reviewDetailResponse.getInputReviewResult()));
+        }
         return ResponseData.success(reviewDetailResponse);
     }
 
@@ -116,4 +143,13 @@
         return supplierInfoService.add(supplierInfoAddRequest);
     }
 
+    /**
+     * 供应商-导出
+     */
+    @RequestMapping("/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusSupplierInfo busSupplierInfo) throws IOException {
+        List<SupplierInfoListResponse> busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo);
+        super.exportExcel(SupplierInfoListResponse.class, busSupplierInfos, ExportEnum.SUPPLIER_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
index 813c208..71eecd2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java
@@ -5,13 +5,11 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierInputReview inputReview) {
+        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(inputReview);
         Page<BusSupplierInputReview> page = PageFactory.defaultPage();
-        List<BusSupplierInputReview> inputReviewInfoList = inputReviewService.getInputReviewInfoListPage(page,inputReview);
-        page.setRecords(inputReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), inputReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
index 92361ac..1a4179d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,10 +31,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(preReview);
         Page<BusSupplierPreReview> page = PageFactory.defaultPage();
-        List<BusSupplierPreReview> preReviewInfoList = preReviewService.getPreReviewInfoListPage(page, preReview);
-        page.setRecords(preReviewInfoList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), preReviewInfoList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
index 145dd7a..ce2a27c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import com.casic.missiles.modular.system.service.IBusSupplierQuarterlyEvaluateService;
+import com.casic.missiles.modular.system.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,10 +32,10 @@
     @PostMapping("/listPage")
     @ResponseBody
     public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(quarterlyEvaluate);
         Page<BusSupplierQuarterlyEvaluate> page = PageFactory.defaultPage();
-        List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoListPage(page, quarterlyEvaluate);
-        page.setRecords(quarterlyEvaluateList);
-        return ResponseData.success(super.packForBT(page));
+        Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), quarterlyEvaluateList);
+        return ResponseData.success(super.packForBT(pages));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
index 0a6d14b..af0719f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.model.application.event.core.EventPublisher;
 import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum;
 import com.casic.missiles.model.response.ResponseData;
@@ -11,9 +8,10 @@
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.MessageFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ClassName DemoController
@@ -42,29 +40,40 @@
         return ResponseData.success();
     }
 
-    /**
-     * 燃气压力项目接收数据测试（拓普瑞平台）
-     */
-    @PostMapping("/recv")
-    @ResponseBody
-    public Object recv(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
-        System.out.println(encode);
-        return ResponseData.success();
-    }
-
-    /**
-     * 燃气压力项目接收数据测试（电信平台）
-     */
-    @PostMapping("/recv2")
-    @ResponseBody
-    public Object recv2(@RequestBody JSONObject jsonObject) {
-        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
-        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
-        return ResponseData.success();
-    }
+//    /**
+//     * 燃气压力项目接收数据测试（拓普瑞平台）
+//     */
+//    @PostMapping("/recv")
+//    @ResponseBody
+//    public Object recv(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("pressure:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb");
+//        System.out.println(encode);
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv2")
+//    @ResponseBody
+//    public Object recv2(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("aep:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
+//
+//    /**
+//     * 燃气压力项目接收数据测试（电信平台）
+//     */
+//    @PostMapping("/recv3")
+//    @ResponseBody
+//    public Object recv3(@RequestBody JSONObject jsonObject) {
+//        String key = MessageFormat.format("own:data:{0}", DateUtil.now());
+//        redisUtil.set(key, JSONObject.toJSONString(jsonObject));
+//        return ResponseData.success();
+//    }
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
index 7bedd42..d17e3d9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MiniUserController.java
@@ -20,7 +20,7 @@
     @Autowired
     private MiniUserService userService;
     /**
-     * 微信小程序登陆接口
+     * 微信小程序登陆接口（废弃，走APP的注册登录流程）
      */
     @PostMapping("/login")
     @ResponseBody
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
new file mode 100644
index 0000000..57b7544
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceiveController.java
@@ -0,0 +1,134 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusDeviceAppDetailMapper;
+import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
+import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
+import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
+import com.casic.missiles.modular.system.model.BusDeviceAppDetail;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
+import com.casic.missiles.modular.system.service.IBusDeviceInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/23 13:39
+ */
+@Slf4j
+@RestController
+@RequestMapping("/hanwei")
+public class ReceiveController {
+    @Autowired
+    private IBusDeviceInfoService deviceInfoService;
+    @Autowired
+    private BusDeviceInfoMapper deviceInfoMapper;
+    @Autowired
+    private BusDeviceAppDetailMapper detailMapper;
+
+    @PostMapping("receive")
+    public Object receive(@RequestBody Map map) {
+        //转为json字符串
+        String paramJson = JSONObject.toJSONString(map);
+        log.info("receive hanwei detector data:{}", paramJson);
+        //转为对象
+        JSONObject jsonObject = JSON.parseObject(paramJson);
+        //把map转为对象后，获取其中的payload对象
+        JSONObject jsonObjectss = jsonObject.getJSONObject("payload");
+
+        //用deviceType（设备型号）来区分
+        if (StringUtils.isEmpty(jsonObject.getString("deviceType"))) {
+            return ResponseData.error("缺少必要参数");
+        }
+
+        //从转为对象的map中获取deviceType的值
+        String deviceType = jsonObject.getString("deviceType");
+
+        if (deviceType.equals("02D1")) {
+            BusDeviceInfo deviceInfo;
+            deviceInfo = deviceInfoService.getDeviceInfo(jsonObject.getString("deviceCode"));
+            if (Objects.isNull(deviceInfo)) {
+                deviceInfo = new BusDeviceInfo();
+                AppDeviceAddRequest appDeviceAddRequest = new AppDeviceAddRequest();
+                appDeviceAddRequest.setDeviceId(jsonObject.getString("deviceCode"));
+                appDeviceAddRequest.setBrandCode("hw0001");
+                appDeviceAddRequest.setBrandName("Hanwei");
+                appDeviceAddRequest.setProductCode("JT-KBZ1");
+                appDeviceAddRequest.setProductName("可燃气体探测器");
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    appDeviceAddRequest.setDeviceStatus(1);
+                } else {
+                    appDeviceAddRequest.setDeviceStatus(0);
+                }
+                appDeviceAddRequest.setIotDevice(1);
+                appDeviceAddRequest.setDeviceActive(1);
+                appDeviceAddRequest.setDeviceBindUser(0);
+                appDeviceAddRequest.setDeviceName("可燃气体探测器");
+
+                BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
+                int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
+
+                BusDeviceAppDetail busDeviceAppDetail = new BusDeviceAppDetail();
+                BeanUtils.copyProperties(appDeviceAddRequest, busDeviceAppDetail);
+                int appInsertFlag = detailMapper.insert(busDeviceAppDetail);
+                if (devInsertFlag <= 0 && appInsertFlag <= 0) {
+                    return ResponseData.error("汉威设备添加失败");
+                }
+            }
+
+            if (StringUtils.isNotEmpty(jsonObjectss.getString("sensorMsg"))) {
+                BusDeviceDetectorInfo detectorInfo = new BusDeviceDetectorInfo();
+                JSONArray array = JSONArray.parseArray(jsonObjectss.getString("sensorMsg"));
+                detectorInfo.setDeviceId(deviceInfo.getDeviceId());
+                if ("正常".equals(jsonObjectss.getString("deviceStatus"))) {
+                    deviceInfo.setDeviceStatus(1);
+                } else {
+                    deviceInfo.setDeviceStatus(0);
+                }
+
+                deviceInfoMapper.updateById(deviceInfo);
+                //for循环遍历
+                for (int i = 0; i < array.size(); i++) {
+                    //把解析好数组转为对象
+                    JSONObject jsonObjects = array.getJSONObject(i);
+                    //当i=0是（array的下标为0）就是sensorMsg对象中的第一组数据
+                    if (i == 0) {
+                        detectorInfo.setSensorCode1(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType1(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal1(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit1(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint1(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus1(jsonObjects.getString("workStatus"));
+                        //当i=1是（array的下标为1）就是sensorMsg对象中的第二组数据
+                    } else if (i == 1) {
+                        detectorInfo.setSensorCode2(jsonObjects.getString("sensorCode"));
+                        detectorInfo.setSensorType2(jsonObjects.getString("sensorType"));
+                        detectorInfo.setSensorVal2(jsonObjects.getString("sensorVal"));
+                        detectorInfo.setSensorValUnit2(jsonObjects.getString("sensorValUnit"));
+                        detectorInfo.setDeciPoint2(jsonObjects.getString("deciPoint"));
+                        detectorInfo.setWorkStatus2(jsonObjects.getString("workStatus"));
+                    }
+                }
+                AppDeviceDataRequest dataRequest = new AppDeviceDataRequest();
+                dataRequest.setDetectorInfo(detectorInfo);
+                return deviceInfoService.addDeviceDataInfo(dataRequest);
+            }
+        }
+        return ResponseData.error("receive hanwei detector data fail");
+
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
index 38a1326..2658188 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java
@@ -4,13 +4,14 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.system.dto.SnInfoOperateRequest;
+import com.casic.missiles.modular.system.enums.ExportEnum;
 import com.casic.missiles.modular.system.enums.OperateTypeEnum;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -63,4 +64,14 @@
         }
         return null;
     }
+
+    /**
+     * 资质要求列表导出
+     */
+    @RequestMapping("/qualify/listExport")
+    @ResponseBody
+    public void listExport(@RequestBody BusQualifyInfo busQualifyInfo) throws IOException {
+        List<BusQualifyInfo> qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo);
+        super.exportExcel(BusQualifyInfo.class, qualifyInfos, ExportEnum.QUALIFY_EXPORT.getFileName());
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
new file mode 100644
index 0000000..48b32d1
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceDetectorInfoMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.BusDeviceDetectorInfo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 壁挂炉数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+public interface BusDeviceDetectorInfoMapper extends BaseMapper<BusDeviceDetectorInfo> {
+
+    BusDeviceDetectorInfo selectByDeviceId(@Param("deviceId") String deviceId);
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
index 41fa64f..93dfd72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusDeviceInfoMapper.java
@@ -1,11 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.statistic.*;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@
  */
 public interface BusDeviceInfoMapper extends BaseMapper<BusDeviceInfo> {
 
-    List<BusDeviceInfo> selectDeviceInfoListPage(@Param("page") Page<BusDeviceInfo> page, @Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> selectDeviceInfoListPage(/*@Param("page") Page<BusDeviceInfo> page, */@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 
     int updateBindUserStatus(@Param("deviceIds") List<String> deviceIds);
 
@@ -40,4 +40,7 @@
 
     List<SupplierDeviceCountGroupDTO> selectCountGroupBySupplier();
 
+    List<String> selectDuplicateSnDevice(@Param("collect") List<String> collect);
+
+    List<BusDeviceInfo> selectDeviceInfoList1(@Param("busDeviceInfo") BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
index 2a93dd1..0905cc2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusProductInfoMapper.java
@@ -24,7 +24,9 @@
 
     List<BusProductInfo> selectProductInfoList(@Param("busProductInfo") BusProductInfo busProductInfo);
 
-    int insertServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
-
     BusProductInfo selectProductInfoById(@Param("id") Long id);
+
+    int deleteByProductId(@Param("productId") Long productId);
+
+    int insertBatchServiceBind(@Param("addServiceBindDTO") AddServiceBindDTO addServiceBindDTO);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
index 59b5cf7..28d7550 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierAnnualAssessMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierAnnualAssessMapper extends BaseMapper<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(@Param("page") Page<BusSupplierAnnualAssess> page, @Param("annualAssess") BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> selectAnnualAssessListPage(/*@Param("page") Page<BusSupplierAnnualAssess> page, */@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> selectAnnualAssessList(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
index 8d28f66..0640686 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInfoMapper.java
@@ -5,9 +5,7 @@
 import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInfoForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.SupplierStatusGroupDTO;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import com.casic.missiles.modular.system.model.BusSupplierPreReview;
+import com.casic.missiles.modular.system.model.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,4 +35,10 @@
     List<SupplierInfoForMonthDTO> selectSupplierInfoListForMonth();
 
     List<SupplierStatusGroupDTO> selectSupplierInfoListGroupByStatus();
+
+    BusSupplierInfo selectNewest(@Param("account") String account);
+
+    int updateStatusByEvaluate(@Param("evaluate") BusSupplierQuarterlyEvaluate evaluate);
+
+    int updateStatusByAssess(@Param("annualAssess") BusSupplierAnnualAssess annualAssess);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
index a56ee32..ffdead9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierInputReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierInputReviewMapper extends BaseMapper<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> selectInputReviewListPage(@Param("page") Page<BusSupplierInputReview> page, @Param("inputReview") BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> selectInputReviewListPage(/*@Param("page") Page<BusSupplierInputReview> page, */@Param("inputReview") BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> selectInputReviewList(@Param("inputReview") BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
index 7d5cfb4..998f0c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierPreReviewMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierPreReviewMapper extends BaseMapper<BusSupplierPreReview> {
 
-    List<BusSupplierPreReview> selectPreReviewListPage(@Param("page") Page<BusSupplierPreReview> page, @Param("preReview") BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> selectPreReviewListPage(/*@Param("page") Page<BusSupplierPreReview> page, */@Param("preReview") BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> selectPreReviewList(@Param("preReview") BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
index 651e458..60e8426 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusSupplierQuarterlyEvaluateMapper.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +17,7 @@
  */
 public interface BusSupplierQuarterlyEvaluateMapper extends BaseMapper<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(@Param("page") Page<BusSupplierQuarterlyEvaluate> page, @Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateListPage(/*@Param("page") Page<BusSupplierQuarterlyEvaluate> page, */@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> selectQuarterEvaluateList(@Param("quarterlyEvaluate") BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
index 90796c7..32d64c3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/StatisticManageMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.modular.system.dto.statistic.UserCountForMonthDTO;
 import com.casic.missiles.modular.system.dto.statistic.UserGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO;
+import com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +17,8 @@
     List<UserGroupDTO> selectUserGroupByRole();
 
     List<UserCountForMonthDTO> selectUserListForMonth();
+
+    List<UserRoleIdGroupDTO> selectUserGroupByRoleId();
+
+    List<UserRoleNameDTO> selectNameById(@Param("ids") List<String> ids);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
index efbe6e3..8a0eed8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppAddressInfoMapper.xml
@@ -17,13 +17,13 @@
             and account like concat('%',#{addressInfo.account},'%')
         </if>
         <if test="addressInfo.province != null and addressInfo.province !=''">
-            and province = #{recommendInfo.province}
+            and province = #{addressInfo.province}
         </if>
         <if test="addressInfo.city != null and addressInfo.city !=''">
-            and city = #{recommendInfo.city}
+            and city = #{addressInfo.city}
         </if>
         <if test="addressInfo.area != null and addressInfo.area !=''">
-            and area = #{recommendInfo.area}
+            and area = #{addressInfo.area}
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
index c8f6964..8320580 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBrandInfoMapper.xml
@@ -13,13 +13,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
@@ -38,13 +38,13 @@
         FROM bus_brand_info bbi
         WHERE 1=1
         <if test="busBrandInfo.brandCode != null and busBrandInfo.brandCode !=''">
-            and brand_code = #{busBrandInfo.brandCode}
+            and brand_code like concat('%',#{busBrandInfo.brandCode},'%')
         </if>
         <if test="busBrandInfo.brandName != null and busBrandInfo.brandName !=''">
-            and brand_name = #{busBrandInfo.brandName}
+            and brand_name like concat('%',#{busBrandInfo.brandName},'%')
         </if>
         <if test="busBrandInfo.brandProperty != null and busBrandInfo.brandProperty !=''">
-            and brand_property = #{busBrandInfo.brandProperty}
+            and brand_property like concat('%',#{busBrandInfo.brandProperty},'%')
         </if>
         ORDER BY update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
index cbdbba9..292dd06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusBusinessOpportunityInfoMapper.xml
@@ -14,8 +14,9 @@
             and item_budget = #{businessOpportunityInfo.itemBudget}
         </if>
         <if test="businessOpportunityInfo.itemDuration != null and businessOpportunityInfo.itemDuration !=''">
-            and item_duration = #{businessOpportunityInfo.itemDuration}
+            and DATE_FORMAT(item_duration,'%Y-%m-%d') = DATE_FORMAT(#{businessOpportunityInfo.itemDuration},'%Y-%m-%d')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectByBusOppoId" resultType="com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
index 0c8d7eb..bb5b650 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusCategoryInfoMapper.xml
@@ -14,10 +14,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
@@ -37,10 +37,10 @@
         LEFT JOIN bus_category_info bcit ON bci.p_category_code = bcit.category_code
         WHERE 1=1
         <if test="busCategoryInfo.categoryCode != null and busCategoryInfo.categoryCode !=''">
-            and bci.category_code = #{busCategoryInfo.categoryCode}
+            and bci.category_code like concat('%',#{busCategoryInfo.categoryCode},'%')
         </if>
         <if test="busCategoryInfo.categoryName != null and busCategoryInfo.categoryName !=''">
-            and bci.category_name = #{busCategoryInfo.categoryName}
+            and bci.category_name like concat('%',#{busCategoryInfo.categoryName},'%')
         </if>
         ORDER BY bci.update_time DESC
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
new file mode 100644
index 0000000..d299232
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceDetectorInfoMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.BusDeviceDetectorInfoMapper">
+
+    <select id="selectByDeviceId" resultType="com.casic.missiles.modular.system.model.BusDeviceDetectorInfo">
+        SELECT *
+        FROM bus_device_detector_info
+        WHERE device_id = #{deviceId}
+        ORDER BY update_time DESC
+        limit 1
+    </select>
+</mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
index ccb9f5d..c85c572 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml
@@ -7,7 +7,7 @@
         produce_date AS produceDate, device_status AS deviceStatus, device_active AS deviceActive, device_active_time AS deviceActiveTime,
         device_bind_user AS deviceBindUser, iot_device AS iotDevice, device_name AS deviceName, device_address AS deviceAddress, device_hardware_version AS deviceHardwareVersion,
         device_software_version AS deviceSoftwareVersion, device_core_parts AS deviceCoreParts, device_mac AS deviceMac, device_ip AS deviceIp,
-        bdi.create_time AS createTime, bdi.update_time AS updateTime
+        bdi.create_time AS createTime, bdi.update_time AS updateTime, bdi.pic_uri AS picUri
     </sql>
 
     <select id="selectDeviceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
@@ -15,13 +15,13 @@
         FROM bus_device_info bdi
         WHERE 1=1
         <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
-            and sn_code = #{busDeviceInfo.snCode}
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
         </if>
         <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
-            and product_code = #{busDeviceInfo.productCode}
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
         </if>
         <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
-            and brand_name = #{busDeviceInfo.brandName}
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
         </if>
         <if test="busDeviceInfo.deviceStatus != null">
             and device_status = #{busDeviceInfo.deviceStatus}
@@ -29,6 +29,7 @@
         <if test="busDeviceInfo.deviceBindUser != null">
             and device_bind_user = #{busDeviceInfo.deviceBindUser}
         </if>
+        ORDER BY bdi.update_time DESC
     </select>
 
     <update id="updateBindUserStatus">
@@ -103,4 +104,37 @@
         RIGHT JOIN bus_supplier_info bsi ON bdi.supplier_id = bsi.id
         GROUP BY bsi.id
     </select>
+
+    <select id="selectDuplicateSnDevice" resultType="java.lang.String">
+        SELECT sn_code
+        FROM bus_device_info
+        <where>
+            sn_code in
+            <foreach  item="item" index="index" collection="collect" open="(" separator="," close=" )">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="selectDeviceInfoList1" resultType="com.casic.missiles.modular.system.model.BusDeviceInfo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM bus_device_info bdi
+        WHERE 1=1
+        <if test="busDeviceInfo.snCode != null and busDeviceInfo.snCode !=''">
+            and sn_code like concat('%',#{busDeviceInfo.snCode},'%')
+        </if>
+        <if test="busDeviceInfo.productCode != null and busDeviceInfo.productCode !=''">
+            and product_code like concat('%',#{busDeviceInfo.productCode},'%')
+        </if>
+        <if test="busDeviceInfo.brandName != null and busDeviceInfo.brandName !=''">
+            and brand_name like concat('%',#{busDeviceInfo.brandName},'%')
+        </if>
+        <if test="busDeviceInfo.deviceStatus != null">
+            and device_status = #{busDeviceInfo.deviceStatus}
+        </if>
+        <if test="busDeviceInfo.deviceBindUser != null">
+            and device_bind_user = #{busDeviceInfo.deviceBindUser}
+        </if>
+        ORDER BY bdi.update_time DESC
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
index c593048..08dcdca 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDistributorInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_distributor_info
         WHERE 1=1
         <if test="distributorInfo.distributorCode != null and distributorInfo.distributorCode !=''">
-            and distributor_code = #{distributorInfo.distributorCode}
+            and distributor_code like concat('%',#{distributorInfo.distributorCode},'%')
         </if>
         <if test="distributorInfo.distributorName != null and distributorInfo.distributorName !=''">
-            and distributor_name = #{distributorInfo.distributorName}
+            and distributor_name like concat('%',#{distributorInfo.distributorName},'%')
         </if>
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
index 621925f..8282ecc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusOrderInfoMapper.xml
@@ -13,6 +13,7 @@
         <if test="orderInfo.userName != null and orderInfo.userName !=''">
             and user_name like concat('%',#{orderInfo.userName},'%')
         </if>
+        ORDER BY update_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.OrderCountDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
index 720a4d4..f70f3c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusProductInfoMapper.xml
@@ -11,15 +11,16 @@
 
     <select id="selectProductInfoListPage" resultType="com.casic.missiles.modular.system.model.BusProductInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -37,15 +38,16 @@
     </select>
 
     <select id="selectProductInfoList" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
-        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName
+        SELECT <include refid="Base_Column_List"/>, bbi.brand_name AS brandName, bci.category_name AS categoryStr
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
+        JOIN bus_category_info bci ON bci.id = bpi.category_id
         WHERE 1=1
         <if test="busProductInfo.productCode != null and busProductInfo.productCode !=''">
-            and product_code = #{busProductInfo.productCode}
+            and product_code like concat('%',#{busProductInfo.productCode},'%')
         </if>
         <if test="busProductInfo.productName != null and busProductInfo.productName !=''">
-            and product_name = #{busProductInfo.productName}
+            and product_name like concat('%',#{busProductInfo.productName},'%')
         </if>
         <if test="busProductInfo.categoryId != null and busProductInfo.categoryId !=''">
             and category_id = #{busProductInfo.categoryId}
@@ -53,16 +55,24 @@
         ORDER BY bpi.update_time DESC
     </select>
 
-    <insert id="insertServiceBind">
-        INSERT
-        INTO bus_product_service_relation(product_id, service_id)
-        VALUES(#{addServiceBindDTO.productId}, #{addServiceBindDTO.serviceId})
-    </insert>
-
     <select id="selectProductInfoById" resultType="com.casic.missiles.modular.system.model.BusProductInfo">
         SELECT bpi.*, bbi.brand_name AS brandName
         FROM bus_product_info bpi
         JOIN bus_brand_info bbi ON bpi.brand_id = bbi.id
         WHERE bpi.id = #{id}
     </select>
+
+    <delete id="deleteByProductId">
+        DELETE FROM bus_product_service_relation
+        WHERE product_id = #{productId}
+    </delete>
+
+    <insert id="insertBatchServiceBind">
+        INSERT
+        INTO bus_product_service_relation(product_id, service_id)
+        VALUES
+        <foreach collection="addServiceBindDTO.serviceIds" item="item" index="index" separator=",">
+            (#{addServiceBindDTO.productId}, #{item})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
index c039184..0afc07a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml
@@ -3,33 +3,35 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.BusServiceInfoMapper">
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, service_code AS serviceCode, service_name AS serviceName, type_code AS typeCode,
-        description AS description, service_time AS serviceTime, remark AS remark,
-        create_time AS createTime, update_time AS updateTime
+        bsi.id AS id, bsi.service_code AS serviceCode, bsi.service_name AS serviceName, bsi.type_code AS typeCode,
+        bsi.description AS description, bsi.service_time AS serviceTime, bsi.remark AS remark,
+        bsi.create_time AS createTime, bsi.update_time AS updateTime
     </sql>
 
     <select id="selectServiceInfoListPage" resultType="com.casic.missiles.modular.system.model.BusServiceInfo"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
     <select id="selectServiceInfoList" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT <include refid="Base_Column_List"/>
-        FROM bus_service_info
+        SELECT <include refid="Base_Column_List"/>, bsti.type_name AS typeCodeName
+        FROM bus_service_info bsi
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE 1=1
         <if test="busServiceInfo.serviceName != null and busServiceInfo.serviceName !=''">
-            and service_name like concat('%',#{busServiceInfo.serviceName},'%')
+            and bsi.service_name like concat('%',#{busServiceInfo.serviceName},'%')
         </if>
         <if test="busServiceInfo.typeCode != null and busServiceInfo.typeCode !=''">
-            and type_code like concat('%',#{busServiceInfo.typeCode},'%')
+            and bsi.type_code like concat('%',#{busServiceInfo.typeCode},'%')
         </if>
     </select>
 
@@ -43,10 +45,11 @@
     </select>
 
     <select id="selectListByRelation" resultType="com.casic.missiles.modular.system.model.BusServiceInfo">
-        SELECT bsi.*
+        SELECT bsi.*, bsti.type_name AS typeCodeName
         FROM bus_service_info bsi
         JOIN bus_product_service_relation bpsr
         ON bsi.id = bpsr.service_id
+        LEFT JOIN bus_service_type_info bsti ON bsti.type_code = bsi.type_code
         WHERE bpsr.product_id = #{id}
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
index b30d66a..f98dd1d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnFixedInfoMapper.xml
@@ -13,7 +13,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
@@ -26,7 +26,7 @@
         FROM bus_sn_fixed_info bsi
         WHERE 1=1
         <if test="busSnInfo.snCode != null and busSnInfo.snCode !=''">
-            and sn_code = #{busSnInfo.snCode}
+            and sn_code like concat('%',#{busSnInfo.snCode},'%')
         </if>
         <if test="busSnInfo.snQuantity != null and busSnInfo.snQuantity !=''">
             and sn_quantity = #{busSnInfo.snQuantity}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
index 689f641..3050aea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSnInfoMapper.xml
@@ -15,7 +15,7 @@
         FROM bus_sn_info bsi
         WHERE 1=1
         <if test="request.keyword != null and request.keyword !=''">
-            and (sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
+            and (sn_fixed_id =#{request.keyword} or sn_fixed_code = #{request.keyword} or sn_start_code = #{request.keyword} or sn_end_code = #{request.keyword})
         </if>
         <if test="request.productCode != null and request.productCode !=''">
             and product_code = #{request.productCode}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
index 287dac7..332dc1b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierAnnualAssessMapper.xml
@@ -5,48 +5,56 @@
     <sql id="Base_Column_List">
         bsaa.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus,
         bsaa.assess_annual AS assessAnnual, bsaa.annual_assess_result AS annualAssessResult,
-        bsaa.annual_assess_illustration AS annualAssessIllustration, bsaa.annual_assess_date AS annualAssessDate,
+        bsaa.annual_assess_illustration AS annualAssessIllustration, DATE_FORMAT(bsaa.annual_assess_date, '%Y-%m-%d') AS annualAssessDate,
         bsaa.annual_assess_file AS annualAssessFile, bsaa.create_time AS createTime, bsaa.update_time AS updateTime
     </sql>
 
-    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectAnnualAssessListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectAnnualAssessList" resultType="com.casic.missiles.modular.system.model.BusSupplierAnnualAssess">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_annual_assess bsaa
+        JOIN bus_supplier_annual_assess bsaa
         ON bsi.supplier_code = bsaa.supplier_code
         WHERE 1=1
         <if test="annualAssess.supplierCode != null and annualAssess.supplierCode !=''">
-            and bsi.supplier_code = #{annualAssess.supplierCode}
+            and bsi.supplier_code like concat('%',#{annualAssess.supplierCode},'%')
         </if>
         <if test="annualAssess.supplierName != null and annualAssess.supplierName !=''">
-            and bsi.supplier_name = #{annualAssess.supplierName}
+            and bsi.supplier_name like concat('%',#{annualAssess.supplierName},'%')
         </if>
         <if test="annualAssess.annualAssessResult != null and annualAssess.annualAssessResult !=''">
             and bsaa.annual_assess_result = #{annualAssess.annualAssessResult}
         </if>
+        <if test="annualAssess.assessAnnual != null and annualAssess.assessAnnual !=''">
+            and bsaa.assess_annual = #{annualAssess.assessAnnual}
+        </if>
+        ORDER BY bsaa.create_time DESC
     </select>
 
     <select id="selectListGroupByAnnual" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierAnnualAssessDTO">
         SELECT assess_annual AS annual, annual_assess_result AS assessResult, ifnull(COUNT(id), 0) AS count
         FROM bus_supplier_annual_assess
+        WHERE assess_annual is not null
         GROUP BY assess_annual, annual_assess_result
     </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
index e126230..a1a0d1e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml
@@ -20,10 +20,10 @@
         FROM bus_supplier_info
         WHERE 1=1
         <if test="busSupplierInfo.supplierCode != null and busSupplierInfo.supplierCode !=''">
-            and supplier_code = #{busSupplierInfo.supplierCode}
+            and supplier_code like concat('%',#{busSupplierInfo.supplierCode},'%')
         </if>
         <if test="busSupplierInfo.supplierName != null and busSupplierInfo.supplierName !=''">
-            and supplier_name = #{busSupplierInfo.supplierName}
+            and supplier_name like concat('%',#{busSupplierInfo.supplierName},'%')
         </if>
         <if test="busSupplierInfo.supplierStatus != null and busSupplierInfo.supplierStatus !=''">
             and supplier_status = #{busSupplierInfo.supplierStatus}
@@ -59,7 +59,7 @@
 
     <update id="updateStatusByInputView2">
         UPDATE bus_supplier_info
-        SET supplier_status = 2, supplier_status_name = '审核中', input_review_result = #{inputReview.inputReviewResult},
+        SET supplier_status = 1, supplier_status_name = '审核通过', input_review_result = #{inputReview.inputReviewResult},
         input_review_illustration = #{inputReview.inputReviewIllustration}, input_review_date = #{inputReview.inputReviewDate}
         WHERE supplier_code = #{inputReview.supplierCode}
     </update>
@@ -75,4 +75,28 @@
         FROM bus_supplier_info
         GROUP BY supplier_status
     </select>
+
+    <select id="selectNewest" resultType="com.casic.missiles.modular.system.model.BusSupplierInfo">
+        SELECT *
+        FROM bus_supplier_info
+        WHERE supplier_account = #{account}
+        ORDER BY update_time DESC
+        LIMIT 1
+    </select>
+
+    <update id="updateStatusByEvaluate">
+        UPDATE bus_supplier_info
+        SET latest_quarterly_evaluate_result = #{evaluate.quarterlyEvaluateResult},
+        latest_quarterly_evaluate_illustration = #{evaluate.quarterlyEvaluateIllustration},
+        latest_quarterly_evaluate_date = #{evaluate.quarterlyEvaluateDate}
+        WHERE supplier_code = #{evaluate.supplierCode}
+    </update>
+
+    <update id="updateStatusByAssess">
+        UPDATE bus_supplier_info
+        SET latest_annual_assess_result = #{annualAssess.annualAssessResult},
+        latest_annual_assess_illustration = #{annualAssess.annualAssessIllustration},
+        latest_annual_assess_date = #{annualAssess.annualAssessDate}
+        WHERE supplier_code = #{annualAssess.supplierCode}
+    </update>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
index ad60319..52cab43 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInputReviewMapper.xml
@@ -4,43 +4,44 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsir.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bsir.input_review_result AS inputReviewResult,
-        bsir.input_review_illustration AS inputReviewIllustration, bsir.input_review_date AS inputReviewDate, bsir.input_review_file AS inputReviewDFile,
+        bsir.input_review_illustration AS inputReviewIllustration, DATE_FORMAT(bsir.input_review_date, '%Y-%m-%d') AS inputReviewDate, bsir.input_review_file AS inputReviewFile,
         bsir.create_time AS createTime, bsir.update_time AS updateTime
     </sql>
 
-    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectInputReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectInputReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierInputReview">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_input_review bsir
+        JOIN bus_supplier_input_review bsir
         ON bsi.supplier_code = bsir.supplier_code
         WHERE 1=1
         <if test="inputReview.supplierCode != null and inputReview.supplierCode !=''">
-            and bsi.supplier_code = #{inputReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{inputReview.supplierCode},'%')
         </if>
         <if test="inputReview.supplierName != null and inputReview.supplierName !=''">
-            and bsi.supplier_name = #{inputReview.supplierName}
+            and bsi.supplier_name like concat('%',#{inputReview.supplierName},'%')
         </if>
         <if test="inputReview.inputReviewResult != null and inputReview.inputReviewResult !=''">
             and bsi.input_review_result = #{inputReview.inputReviewResult}
         </if>
+        ORDER BY bsir.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierInputReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
index b139d0f..4d13404 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierPreReviewMapper.xml
@@ -4,49 +4,50 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         supplier_code AS supplierCode, supplier_name AS supplierName, pre_review_result AS preReviewResult,
-        pre_review_illustration AS preReviewIllustration, pre_review_date AS preReviewDate, pre_review_file AS preReviewDFile,
+        pre_review_illustration AS preReviewIllustration, DATE_FORMAT(pre_review_date, '%Y-%m-%d') AS preReviewDate, pre_review_file AS preReviewDFile,
         create_time AS createTime, update_time AS updateTime
     </sql>
 
     <sql id="Info_Column_List">
         bspr.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName, bsi.supplier_status AS supplierStatus, bspr.pre_review_result AS preReviewResult,
-        bspr.pre_review_illustration AS preReviewIllustration, bspr.pre_review_date AS preReviewDate, bspr.pre_review_file AS preReviewDFile,
+        bspr.pre_review_illustration AS preReviewIllustration, DATE_FORMAT(bspr.pre_review_date, '%Y-%m-%d') AS preReviewDate, bspr.pre_review_file AS preReviewFile,
         bspr.create_time AS createTime, bspr.update_time AS updateTime
     </sql>
 
-    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectPreReviewListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreReviewList" resultType="com.casic.missiles.modular.system.model.BusSupplierPreReview">
         SELECT <include refid="Info_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_pre_review bspr
+        JOIN bus_supplier_pre_review bspr
         ON bsi.supplier_code = bspr.supplier_code
         WHERE 1=1
         <if test="preReview.supplierCode != null and preReview.supplierCode !=''">
-            and bsi.supplier_code = #{preReview.supplierCode}
+            and bsi.supplier_code like concat('%',#{preReview.supplierCode},'%')
         </if>
         <if test="preReview.supplierName != null and preReview.supplierName !=''">
-            and bsi.supplier_name = #{preReview.supplierName}
+            and bsi.supplier_name like concat('%',#{preReview.supplierName},'%')
         </if>
         <if test="preReview.preReviewResult != null and preReview.preReviewResult !=''">
             and bsi.pre_review_result = #{preReview.preReviewResult}
         </if>
+        ORDER BY bspr.create_time DESC
     </select>
 
     <select id="selectPreMonthCountByNearYear" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierPreReviewDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
index ff8d544..fcc65fa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierQuarterlyEvaluateMapper.xml
@@ -4,50 +4,57 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bsqe.id AS id, bsi.supplier_code AS supplierCode, bsi.supplier_name AS supplierName,bsi.supplier_status AS supplierStatus,
-        bspe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
-        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, bsqe.quarterly_evaluate_date AS quarterlyEvaluateDate,
+        bsqe.evaluate_year AS evaluateYear, bsqe.evaluate_quarterly AS evaluateQuarterly, bsqe.quarterly_evaluate_result AS quarterlyEvaluateResult,
+        bsqe.quarterly_evaluate_illustration AS quarterlyEvaluateIllustration, DATE_FORMAT(bsqe.quarterly_evaluate_date, '%Y-%m-%d') AS quarterlyEvaluateDate,
         bsqe.quarterly_evaluate_file AS quarterlyEvaluateFile, bsqe.create_time AS createTime, bsqe.update_time AS updateTime
     </sql>
 
-    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectQuarterEvaluateListPage" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectQuarterEvaluateList" resultType="com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate">
         SELECT <include refid="Base_Column_List"/>
         FROM bus_supplier_info bsi
-        LEFT JOIN bus_supplier_quarterly_evaluate bsqe
+        JOIN bus_supplier_quarterly_evaluate bsqe
         ON bsi.supplier_code = bsqe.supplier_code
         WHERE 1=1
         <if test="quarterlyEvaluate.supplierCode != null and quarterlyEvaluate.supplierCode !=''">
-            and bsi.supplier_code = #{quarterlyEvaluate.supplierCode}
+            and bsi.supplier_code like concat('%',#{quarterlyEvaluate.supplierCode},'%')
         </if>
         <if test="quarterlyEvaluate.supplierName != null and quarterlyEvaluate.supplierName !=''">
-            and bsi.supplier_name = #{quarterlyEvaluate.supplierName}
+            and bsi.supplier_name like concat('%',#{quarterlyEvaluate.supplierName},'%')
         </if>
         <if test="quarterlyEvaluate.quarterlyEvaluateResult != null and quarterlyEvaluate.quarterlyEvaluateResult !=''">
-            and bsi.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+            and bsqe.quarterly_evaluate_result = #{quarterlyEvaluate.quarterlyEvaluateResult}
+        </if>
+        <if test="quarterlyEvaluate.evaluateYear != null and quarterlyEvaluate.evaluateYear !=''">
+            and bsqe.evaluate_year = #{quarterlyEvaluate.evaluateYear}
         </if>
         <if test="quarterlyEvaluate.evaluateQuarterly != null and quarterlyEvaluate.evaluateQuarterly !=''">
-            and bsir.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
+            and bsqe.evaluate_quarterly = #{quarterlyEvaluate.evaluateQuarterly}
         </if>
+        ORDER BY bsqe.create_time DESC
     </select>
 
     <select id="selectListGroupByEvaluate" resultType="com.casic.missiles.modular.system.dto.statistic.SupplierQuarterlyEvaluateDTO">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
index 39ad109..a47561b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticManageMapper.xml
@@ -15,4 +15,20 @@
         LEFT JOIN sys_user b ON a.ID = b.ROLE_ID AND b.`status` = '1'
  		GROUP BY a.NAME, date(b.CREATE_TIME)
     </select>
+
+    <select id="selectUserGroupByRoleId" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleIdGroupDTO">
+        SELECT ROLE_ID AS roleId, IFNULL(COUNT(id), 0) AS userCount
+        FROM sys_user
+        WHERE STATUS = '1'
+ 		GROUP BY ROLE_ID
+    </select>
+
+    <select id="selectNameById" resultType="com.casic.missiles.modular.system.dto.statistic.UserRoleNameDTO">
+        SELECT ID AS roleId, NAME AS ROLE_NAME
+        FROM sys_role
+        WHERE ID IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
index 56a3f5d..c150de5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AddServiceBindDTO.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description: 添加服务绑定请求实体
  * @Author: wangpeng
@@ -10,5 +12,5 @@
 @Data
 public class AddServiceBindDTO {
     private Long productId;
-    private Long serviceId;
+    private List<Long> serviceIds;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
index 8647727..e934c5a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AppDeviceDataRequest.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.modular.system.dto;
 
-import com.casic.missiles.modular.system.model.BusDeviceCookerHoodInfo;
-import com.casic.missiles.modular.system.model.BusDeviceGasStoveInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHangingFurnaceInfo;
-import com.casic.missiles.modular.system.model.BusDeviceHeaterInfo;
+import com.casic.missiles.modular.system.model.*;
 import lombok.Data;
 
 /**
@@ -22,4 +19,7 @@
     //热水器
     private BusDeviceHeaterInfo heaterInfo;
 
+    //汉威可燃气体探测仪
+    private BusDeviceDetectorInfo detectorInfo;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
index b52a493..63ec9e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DistributorInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,18 +14,29 @@
  * @Author: wangpeng
  * @Date: 2022/9/26 12:37
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class DistributorInfoListResponse {
+    @ExcelProperty("经销商编号")
     private String distributorCode;
+    @ExcelProperty("经销商名称")
     private String distributorName;
     private String distributorArea;
+    @ExcelProperty("企业地址")
     private String distributorAreaName;
     private String companyNature;
+    @ExcelProperty("单位性质")
     private String companyNatureName;
     private String companyType;
+    @ExcelProperty("企业类型")
     private String companyTypeName;
     private String companyProvince;
     private String companyCity;
     private String companyArea;
+    @ExcelProperty("企业地址")
     private String companyAddress;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
index 983e227..4923bd6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SnFixedItemDTO.java
@@ -20,6 +20,11 @@
     private String digitPre;
 
     /**
+     * SN码位前项编码说明
+     */
+    private String digitPreIllustration;
+
+    /**
      * SN码编码项说明
      */
     private String digitItemIllustration;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
index 78a18e1..afd9ff9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoListResponse.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 /**
@@ -7,19 +14,35 @@
  * @Author: wangpeng
  * @Date: 2022/9/12 14:25
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 public class SupplierInfoListResponse {
     private Long id;
+    @ExcelProperty("供应商编号")
     private String supplierCode;
+    @ExcelProperty("供应商名称")
     private String supplierName;
+//    @ExcelProperty("供应商状态")
     private String supplierStatus;
+    @ExcelProperty("供应商状态")
     private String supplierStatusName;
+//    @ExcelProperty("资料预审结果")
     private String preReviewResult;
+    @ExcelProperty("资料预审结果")
     private String preReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String inputReviewResult;
+    @ExcelProperty("录库评审结果")
     private String inputReviewResultName;
+//    @ExcelProperty("录库评审结果")
     private String latestQuarterlyEvaluateResult;
+    @ExcelProperty("最近季度评价结果")
     private String latestQuarterlyEvaluateResultName;
     private String latestAnnualAssessResult;
+    @ExcelProperty("最新年度考核结果")
     private String latestAnnualAssessResultName;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
index a752bc0..c8c2ac1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/SupplierInfoReviewDetailResponse.java
@@ -16,7 +16,9 @@
     private String supplierStatus;
     private String supplierStatusName;
     private String preReviewResult;
+    private String preReviewResultName;
     private String inputReviewResult;
+    private String inputReviewResultName;
     //历史季度评价
     private List<BusSupplierQuarterlyEvaluate> quarterlyEvaluateList;
     //历史年度考核
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
new file mode 100644
index 0000000..742e0c0
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleIdGroupDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleIdGroupDTO {
+    private String roleId;
+    private Integer userCount;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
new file mode 100644
index 0000000..bc50629
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/statistic/UserRoleNameDTO.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/1 10:19
+ */
+@Data
+public class UserRoleNameDTO {
+    private String roleId;
+    private String roleName;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
index 5c31d86..33c34db 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/tuya/TuyaRequest.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.modular.system.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -25,7 +26,12 @@
         Object _result;
         try {
             String accessToken = tuyaRequestHelper.getAccesToken();
-            String url = tuyaRequestHelper.getUrlStr(uri, null);
+            String url = "";
+            if(CollectionUtils.isEmpty(params)){
+                url = tuyaRequestHelper.getUrlStr(uri, null);
+            }else{
+                url = tuyaRequestHelper.getUrlStr(uri, params);
+            }
             Map<String, String> newHeaders = tuyaRequestHelper.getHeader("GET", url, customHeaders, null, accessToken);
             log.info("doGetRequest => Url: {}, headers: {}", uri, "\n" + JSONObject.toJSONString(newHeaders));
             String response = HttpUtil.get(url, params, newHeaders);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
index 340806d..8abf425 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.modular.system.enums;
 
-import lombok.Data;
-
 /**
  * @Description:
  * @Author: wangpeng
@@ -11,9 +9,11 @@
     BRAND_EXPORT("brandData.xlsx", "brandData.xlsx", "品牌数据"),
     CATEGORY_EXPORT("categoryData.xlsx", "categoryData.xlsx", "品类数据"),
     PRODUCT_EXPORT("productData.xlsx", "productData.xlsx", "产品数据"),
+    QUALIFY_EXPORT("qualifyData.xlsx", "qualifyData.xlsx", "资质管理数据"),
     SN_FIXED_EXPORT("snFixedData.xlsx", "snFixedData.xlsx", "SN码固定标识数据"),
     SN_EXPORT("snData.xlsx", "snData.xlsx", "SN码数据"),
-    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据");
+    DEVICE_EXPORT("deviceData.xlsx", "deviceData.xlsx", "设备数据"),
+    SUPPLIER_EXPORT("supplierData.xlsx", "supplierData.xlsx", "供应商数据");
 
     ExportEnum(String fileTempPath, String fileName, String description) {
         this.fileTempPath = fileTempPath;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
index a0084af..ba0e4a1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/job/SmartKitchenJob.java
@@ -7,11 +7,14 @@
 import com.casic.missiles.modular.system.dao.BusDeviceInfoMapper;
 import com.casic.missiles.modular.system.dto.DeviceStatusUpdateDTO;
 import com.casic.missiles.modular.system.dto.tuya.TuyaRequest;
+import com.casic.missiles.modular.system.model.BusDeviceInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +41,24 @@
     @Scheduled(cron = "0 0 0/1 * * ?")
     public void onlineStatus() {
         //查询所有设备deviceId
-        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
-        String deviceIdsStr = deviceIds.stream().collect(Collectors.joining(","));
+//        List<String> deviceIds = deviceInfoMapper.selectDeviceIdList();
+        List<BusDeviceInfo> list = deviceInfoMapper.selectDeviceInfoList();
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        //调用涂鸦批量查询设备实时位置获取经纬度，最多获取50个
+        List<BusDeviceInfo> deviceInfos = list;
+        if(list.size() > 50){
+            deviceInfos = list.subList(0, 50);
+        }
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v1.0/iot-03/devices/status", params, null);
         if (!getFlag) {
-            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIds, tuyaRequest.getError());
+            log.info("调用涂鸦，批量获取设备最新状态接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
         } else {
             JSONArray result = (JSONArray) tuyaRequest.getResult();
             List<DeviceStatusUpdateDTO> updateList = new ArrayList<>();
@@ -57,7 +71,7 @@
                 for (Object statusDTO : statusArr) {
                     JSONObject statusJsonDTO = (JSONObject) JSON.toJSON(statusDTO);
                     if ("switch".equals(statusJsonDTO.getString("code"))) {
-                        boolean aSwitch = statusJsonDTO.getBoolean("switch");
+                        boolean aSwitch = statusJsonDTO.getBoolean("value");
                         //状态：在线
                         if(aSwitch){
                             deviceStatusUpdateDTO.setDeviceStatus(1);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
index 18e22ba..8ae7828 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusCategoryInfo.java
@@ -1,6 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +15,6 @@
 import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,11 @@
  * @since 2022-08-17
  */
 @Data
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @TableName("bus_category_info")
 public class BusCategoryInfo implements Serializable {
 
@@ -33,12 +43,14 @@
     /**
      * 品类编号
      */
+    @ExcelProperty("品类编号")
     @TableField("category_code")
     private String categoryCode;
 
     /**
      * 品类名称
      */
+    @ExcelProperty("品类名称")
     @TableField("category_name")
     private String categoryName;
 
@@ -51,6 +63,7 @@
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
@@ -78,6 +91,7 @@
 
     //父品类名称
     @TableField(exist = false)
+    @ExcelProperty("上级品类")
     private String pCategoryName;
 
     //id列表
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
new file mode 100644
index 0000000..99e2bb5
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceDetectorInfo.java
@@ -0,0 +1,64 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 可燃气体探测器数据表
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2022-09-30
+ */
+@Data
+@TableName("bus_device_detector_info")
+public class BusDeviceDetectorInfo implements Serializable {
+    @JsonIgnore
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 汉威设备id
+     */
+    @TableField("device_id")
+    private String deviceId;
+    @TableField("sensor_code1")
+    private String sensorCode1;		// 传感器编号
+    @TableField("sensor_type1")
+    private String sensorType1;		// 检测类型
+    @TableField("work_status1")
+    private String workStatus1;        // 工作状态
+    @TableField("sensor_val1")
+    private String sensorVal1;		// 检测值
+    @TableField("sensor_val_unit1")
+    private String sensorValUnit1;		// 单位
+    @TableField("deci_point1")
+    private String deciPoint1;		// 数据小数点位数
+    @TableField("sensor_code2")
+    private String sensorCode2;
+    @TableField("sensor_type2")
+    private String sensorType2;
+    @TableField("work_status2")
+    private String workStatus2;
+    @TableField("sensor_val2")
+    private String sensorVal2;
+    @TableField("sensor_val_unit2")
+    private String sensorValUnit2;
+    @TableField("deci_point2")
+    private String deciPoint2;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
index 2ab817d..7aee2f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDeviceInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,6 +24,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_device_info")
 public class BusDeviceInfo implements Serializable {
@@ -29,6 +41,7 @@
     /**
      * SN码
      */
+    @ExcelProperty("SN码")
     @TableField("sn_code")
     private String snCode;
 
@@ -47,6 +60,7 @@
     /**
      * 设备品牌名称
      */
+    @ExcelProperty("设备品牌名称")
     @TableField("brand_name")
     private String brandName;
 
@@ -59,12 +73,14 @@
     /**
      * 设备所属产品名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("produce_date")
     private String produceDate;
 
@@ -77,18 +93,21 @@
     /**
      * 是否激活
      */
+    @ExcelProperty("是否激活")
     @TableField("device_active")
     private Integer deviceActive;
 
     /**
      * 设备激活时间
      */
+    @ExcelProperty("激活时间")
     @TableField("device_active_time")
     private String deviceActiveTime;
 
     /**
      * 是否绑定用户（1是0否）
      */
+    @ExcelProperty("是否绑定用户")
     @TableField("device_bind_user")
     private Integer deviceBindUser;
 
@@ -152,6 +171,9 @@
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("pic_uri")
+    private String picUri;
+
     public void toDeviceInfo(SnInfoOperateRequest request) {
         this.setSnCode(request.getSnFixedCode() + request.getSnStartCode());
         this.setBrandCode(request.getProductBrandCode());
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
index d22f153..580f3ce 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDistributorInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-26
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_distributor_info")
 public class BusDistributorInfo implements Serializable {
@@ -29,12 +40,14 @@
     /**
      * 经销商编号
      */
+    @ExcelProperty("经销商编号")
     @TableField("distributor_code")
     private String distributorCode;
 
     /**
      * 经销商名称
      */
+    @ExcelProperty("经销商名称")
     @TableField("distributor_name")
     private String distributorName;
 
@@ -47,6 +60,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("distributor_area_name")
     private String distributorAreaName;
 
@@ -59,6 +73,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -71,30 +86,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
index 1cbc3c2..e19a586 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusOrderInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -127,15 +126,4 @@
     @TableField("update_time")
     private String updateTime;
 
-    public BusOrderInfo toOrderInfo(BusBusinessOpportunityInfo businessOpportunityInfo) {
-        BusOrderInfo orderInfo = new BusOrderInfo();
-        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
-        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
-        //下单人角色，来自分子公司的商机报备，字典key3
-        orderInfo.setUserRole("3");
-        //订单来源，商机转订单，字典key2
-        orderInfo.setOrderSource("2");
-        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
-        return orderInfo;
-    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
index dad9c97..4393010 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusProductInfo.java
@@ -12,12 +12,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -148,7 +145,6 @@
     @TableField(exist = false)
     private List<BusBrandCategoryRelation> categorys;
 
-    //品类List，string形式，导出使用
     @TableField(exist = false)
     @ExcelProperty("品类名称")
     private String categoryStr;
@@ -163,10 +159,10 @@
     @TableField(exist = false)
     private List<BusServiceInfo> serviceInfos;
 
-    public String getCategoryStr() {
-        if(!CollectionUtils.isEmpty(this.categorys)){
-            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
-        }
-        return "";
-    }
+//    public String getCategoryStr() {
+//        if(!CollectionUtils.isEmpty(this.categorys)){
+//            return this.categorys.stream().map(BusBrandCategoryRelation::getCategoryName).collect(Collectors.joining(","));
+//        }
+//        return "";
+//    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
index dabd9da..4f7744d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusQualifyInfo.java
@@ -1,12 +1,18 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-10-11
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_qualify_info")
 public class BusQualifyInfo implements Serializable {
@@ -29,30 +40,35 @@
     /**
      * 资质编号
      */
+    @ExcelProperty("资质编号")
     @TableField("qualify_code")
     private String qualifyCode;
 
     /**
      * 资质要求名称
      */
+    @ExcelProperty("资质要求名称")
     @TableField("qualify_name")
     private String qualifyName;
 
     /**
      * 资质描述
      */
+    @ExcelProperty("资质描述")
     @TableField("qualify_desc")
     private String qualifyDesc;
 
     /**
      * 资质证明材料
      */
+    @ExcelProperty("资质证明材料")
     @TableField("prove_material_desc")
     private String proveMaterialDesc;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     @TableField("remark")
     private String remark;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
index a62cd9c..1380a3a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusServiceInfo.java
@@ -7,7 +7,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -73,4 +72,7 @@
     @TableField(exist = false)
     private List<Long> ids;
 
+    @TableField(exist = false)
+    private String typeCodeName;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
index 94e52b0..e82d468 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSnInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,7 +14,6 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-05
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_sn_info")
 public class BusSnInfo implements Serializable {
@@ -36,29 +47,34 @@
      * SN码固定标识
      */
     @TableField("sn_fixed_code")
+    @ExcelProperty("SN码(固定标识)")
     private String snFixedCode;
 
     /**
      * SN码固定标识名字
      */
     @TableField("sn_fixed_illustration")
+    @ExcelProperty("SN码(固定标识名字)")
     private String snFixedIllustration;
 
     /**
      * SN码起始序列号
      */
+    @ExcelProperty("SN码(起始序列号)")
     @TableField("sn_start_code")
     private String snStartCode;
 
     /**
      * SN码终止序列号
      */
+    @ExcelProperty("SN码(终止序列号)")
     @TableField("sn_end_code")
     private String snEndCode;
 
     /**
      * 码段个数
      */
+    @ExcelProperty("码段个数")
     @TableField("sn_segment_num")
     private Integer snSegmentNum;
 
@@ -71,6 +87,7 @@
     /**
      * 所属产品型号名字
      */
+    @ExcelProperty("设备型号")
     @TableField("product_name")
     private String productName;
 
@@ -89,12 +106,14 @@
     /**
      * 硬件版本
      */
+    @ExcelProperty("硬件版本")
     @TableField("hardware_version")
     private String hardwareVersion;
 
     /**
      * 软件版本
      */
+    @ExcelProperty("软件版本")
     @TableField("software_version")
     private String softwareVersion;
 
@@ -107,6 +126,7 @@
     /**
      * 生产日期
      */
+    @ExcelProperty("生产日期")
     @TableField("product_date")
     private String productDate;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
index 21e4330..dd5034f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusSupplierInfo.java
@@ -1,5 +1,12 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,6 +23,11 @@
  * @author wangpeng
  * @since 2022-09-12
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
 @Data
 @TableName("bus_supplier_info")
 public class BusSupplierInfo implements Serializable {
@@ -28,6 +40,7 @@
     /**
      * 供应商编号（后台生成）
      */
+    @ExcelProperty("供应商编号")
     @TableField("supplier_code")
     private String supplierCode;
 
@@ -40,6 +53,7 @@
     /**
      * 供应商名称（单位名称）
      */
+    @ExcelProperty("供应商名称")
     @TableField("supplier_name")
     private String supplierName;
 
@@ -52,78 +66,91 @@
     /**
      * 供应商状态（字典value）
      */
+    @ExcelProperty("供应商状态")
     @TableField("supplier_status_name")
     private String supplierStatusName;
 
     /**
      * 资料预审结果
      */
+    @ExcelProperty("资料预审结果")
     @TableField("pre_review_result")
     private String preReviewResult;
 
     /**
      * 资料预审说明
      */
+    @ExcelProperty("资料预审说明")
     @TableField("pre_review_illustration")
     private String preReviewIllustration;
 
     /**
      * 资料预审日期
      */
+    @ExcelProperty("资料预审日期")
     @TableField("pre_review_date")
     private String preReviewDate;
 
     /**
      * 录库评审结果
      */
+    @ExcelProperty("录库评审结果")
     @TableField("input_review_result")
     private String inputReviewResult;
 
     /**
      * 录库评审说明
      */
+    @ExcelProperty("录库评审说明")
     @TableField("input_review_illustration")
     private String inputReviewIllustration;
 
     /**
      * 录库评审日期
      */
+    @ExcelProperty("录库评审日期")
     @TableField("input_review_date")
     private String inputReviewDate;
 
     /**
      * 最近季度评价结果
      */
+    @ExcelProperty("最近季度评价结果")
     @TableField("latest_quarterly_evaluate_result")
     private String latestQuarterlyEvaluateResult;
 
     /**
      * 最近季度评价说明
      */
+    @ExcelProperty("最近季度评价说明")
     @TableField("latest_quarterly_evaluate_illustration")
     private String latestQuarterlyEvaluateIllustration;
 
     /**
      * 最近季度评价日期
      */
+    @ExcelProperty("最近季度评价日期")
     @TableField("latest_quarterly_evaluate_date")
     private String latestQuarterlyEvaluateDate;
 
     /**
      * 最新年度考核结果
      */
+    @ExcelProperty("最新年度考核结果")
     @TableField("latest_annual_assess_result")
     private String latestAnnualAssessResult;
 
     /**
      * 最新年度考核说明
      */
+    @ExcelProperty("最新年度考核说明")
     @TableField("latest_annual_assess_illustration")
     private String latestAnnualAssessIllustration;
 
     /**
      * 最新年度考核日期
      */
+    @ExcelProperty("最新年度考核日期")
     @TableField("latest_annual_assess_date")
     private String latestAnnualAssessDate;
 
@@ -136,6 +163,7 @@
     /**
      * 所在区域（字典value）
      */
+    @ExcelProperty("所在区域")
     @TableField("supplier_area_name")
     private String supplierAreaName;
 
@@ -148,6 +176,7 @@
     /**
      * 单位性质（字典value）
      */
+    @ExcelProperty("单位性质")
     @TableField("company_nature_name")
     private String companyNatureName;
 
@@ -160,30 +189,35 @@
     /**
      * 企业类型（字典value）
      */
+    @ExcelProperty("企业类型")
     @TableField("company_type_name")
     private String companyTypeName;
 
     /**
      * 企业地址-省
      */
+    @ExcelProperty("企业地址-省")
     @TableField("company_province")
     private String companyProvince;
 
     /**
      * 企业地址-市
      */
+    @ExcelProperty("企业地址-市")
     @TableField("company_city")
     private String companyCity;
 
     /**
      * 企业地址-区
      */
+    @ExcelProperty("企业地址-区")
     @TableField("company_area")
     private String companyArea;
 
     /**
      * 企业地址-详细地址
      */
+    @ExcelProperty("详细地址")
     @TableField("company_address")
     private String companyAddress;
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
index 5f5d92c..3989241 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDeviceInfoService.java
@@ -1,11 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.AppDeviceAddRequest;
 import com.casic.missiles.modular.system.dto.AppDeviceDataRequest;
 import com.casic.missiles.modular.system.dto.DeviceUnbindRequest;
 import com.casic.missiles.modular.system.model.BusDeviceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -19,7 +18,7 @@
  */
 public interface IBusDeviceInfoService extends IService<BusDeviceInfo> {
 
-    List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo);
+    List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo);
 
     Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest);
 
@@ -33,4 +32,9 @@
 
     Object statisticsData();
 
+    BusDeviceInfo getDeviceInfo(String deviceCode);
+
+    List<String> getDuplicateSnDevice(List<String> collect);
+
+    List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
index df49b7c..f65fe97 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusDistributorInfoService.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.DetailBusinessResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoAddRequest;
 import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse;
 import com.casic.missiles.modular.system.dto.DistributorInfoListResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusDistributorInfo;
@@ -29,7 +29,7 @@
 
     BusDetailPerson getDistributorPersonDetail(String distributorCode);
 
-    BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
+    DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo);
 
     Object add(DistributorInfoAddRequest distributorInfoAddRequest);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
index 0db1854..e474cd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierAnnualAssessService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierAnnualAssessService extends IService<BusSupplierAnnualAssess> {
 
-    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess);
+    List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess);
 
     List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
index d110ba5..6943af6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInfoService.java
@@ -1,11 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest;
-import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse;
-import com.casic.missiles.modular.system.model.BusDetailBusiness;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusDetailCertificate;
 import com.casic.missiles.modular.system.model.BusDetailPerson;
 import com.casic.missiles.modular.system.model.BusSupplierInfo;
@@ -30,7 +26,7 @@
 
     BusDetailPerson getSupplierPersonDetail(String supplierCode);
 
-    BusDetailBusiness getSupplierBusinessDetail(String supplierCode);
+    DetailBusinessResponse getSupplierBusinessDetail(String supplierCode);
 
     SupplierInfoReviewDetailResponse getSupplierReviewDetail(String supplierCode);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
index 1623f13..d494512 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierInputReviewService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierInputReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierInputReviewService extends IService<BusSupplierInputReview> {
 
-    List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview);
+    List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview);
 
     List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
index a032f27..3cbe4c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierPreReviewService.java
@@ -1,14 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.modular.system.dto.SupplierInfoListResponse;
-import com.casic.missiles.modular.system.model.BusCategoryInfo;
-import com.casic.missiles.modular.system.model.BusSupplierInfo;
 import com.casic.missiles.modular.system.model.BusSupplierPreReview;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -20,7 +14,7 @@
  * @since 2022-09-12
  */
 public interface IBusSupplierPreReviewService extends IService<BusSupplierPreReview> {
-    List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview);
+    List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview);
 
     List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
index c1d694b..8f445f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusSupplierQuarterlyEvaluateService.java
@@ -1,11 +1,8 @@
 package com.casic.missiles.modular.system.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -18,7 +15,7 @@
  */
 public interface IBusSupplierQuarterlyEvaluateService extends IService<BusSupplierQuarterlyEvaluate> {
 
-    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate);
+    List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
     List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
index e16b3dd..3a359d2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/AppPushInfoServiceImpl.java
@@ -7,7 +7,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.AppPushInfoMapper;
 import com.casic.missiles.modular.system.dao.UserMapper;
-import com.casic.missiles.modular.system.model.AppAddressInfo;
 import com.casic.missiles.modular.system.model.AppPushInfo;
 import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.modular.system.service.IAppPushInfoService;
@@ -75,7 +74,7 @@
             //插入数据表
             if (pushInfo.getTargetUsers().startsWith("标签用户")) {
                 String targetUsers = pushInfo.getProvinceList().stream().collect(Collectors.joining(","));
-                pushInfo.setTargetUsers("标签用户，" + targetUsers);
+                pushInfo.setTargetUsers("标签用户," + targetUsers);
             }
             int insertFlag = pushInfoMapper.insert(pushInfo);
             if (insertFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
index 925149b..cae7421 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusBusinessOpportunityInfoServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.modular.system.dao.BusOrderInfoMapper;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityDetailResponse;
 import com.casic.missiles.modular.system.dto.BusinessOpportunityInfoRequest;
-import com.casic.missiles.modular.system.dto.OrderInfoDetailResponse;
 import com.casic.missiles.modular.system.dto.TurnOrderRequest;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityInfo;
 import com.casic.missiles.modular.system.model.BusBusinessOpportunityProductInfo;
@@ -103,14 +102,23 @@
 
         BusOrderInfo orderInfo = new BusOrderInfo();
         orderInfo.setOrderId(orderId);
-        orderInfo.toOrderInfo(businessOpportunityInfo);
+        orderInfo.setUserName(businessOpportunityInfo.getItemManager());
+        orderInfo.setUserPhone(businessOpportunityInfo.getPhone());
+        //下单人角色，来自分子公司的商机报备，字典key3
+        orderInfo.setUserRole("3");
+        //订单来源，商机转订单，字典key2
+        orderInfo.setOrderSource("2");
+        // TODO: 2022/9/26 签订日期、交付日期字段数据待定
         BeanUtils.copyProperties(turnOrderRequest, orderInfo);
         int insertFlag = orderInfoMapper.insert(orderInfo);
         boolean saveBatchFlag = orderProductInfoService.saveBatch(productList);
         //删除商机信息
         int delFlag = businessOpportunityInfoMapper.deleteById(businessOpportunityInfo);
         List<Long> ids = businessOpportunityProductInfos.stream().map(BusBusinessOpportunityProductInfo::getId).collect(Collectors.toList());
-        int delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        int delBatchFlag = 1;
+        if(CollectionUtil.isNotEmpty(ids)){
+            delBatchFlag = businessOpportunityProductInfoMapper.deleteBatchIds(ids);
+        }
 
         if(insertFlag > 0 && saveBatchFlag && delFlag > 0 && delBatchFlag > 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
index 8632c35..655cf2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusCategoryInfoServiceImpl.java
@@ -107,11 +107,11 @@
         //产品参数表
         boolean pp = true;
         int bpp = 1;
+        //批量删除
+        Map<String, Object> productParamMap = new HashMap<>();
+        productParamMap.put("category_id", busCategoryInfo.getId());
+        bpp = productParamMapper.deleteByMap(productParamMap);
         if(!CollectionUtils.isEmpty(busCategoryInfo.getProductParams())){
-            //批量删除
-            Map<String, Object> productParamMap = new HashMap<>();
-            productParamMap.put("category_id", busCategoryInfo.getId());
-            bpp = productParamMapper.deleteByMap(productParamMap);
             //批量添加
             List<BusProductParam> productParams = busCategoryInfo.getProductParams();
             if(!CollectionUtils.isEmpty(productParams)){
@@ -122,7 +122,7 @@
             }
         }
 
-        if(upBrandFlag > 0 && deQualifyFlag > 0 && cqr && bpp > 0 && pp){
+        if(upBrandFlag > 0 && pp){
             return ResponseData.success();
         }
         return ResponseData.error("更新品类信息失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
index 34bad81..45ac38b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDeviceInfoServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.*;
@@ -22,6 +21,7 @@
 
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,21 +49,53 @@
     @Autowired
     private BusDeviceHangingFurnaceInfoMapper hangingFurnaceInfoMapper;
     @Autowired
+    private BusDeviceDetectorInfoMapper detectorInfoMapper;
+    @Autowired
     private BusSupplierInfoMapper supplierInfoMapper;
 
     @Override
-    public List<BusDeviceInfo> getDeviceInfoListPage(Page<BusDeviceInfo> page, BusDeviceInfo busDeviceInfo) {
-        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(page, busDeviceInfo);
+    public List<BusDeviceInfo> getDeviceInfoListPage(/*Page<BusDeviceInfo> page, */BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoListPage(busDeviceInfo);
         if (CollectionUtils.isEmpty(busDeviceInfos)) {
             return new ArrayList<>();
         }
-        return busDeviceInfos;
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
 
     }
 
     @Override
+    public List<BusDeviceInfo> getDeviceInfoList(BusDeviceInfo busDeviceInfo) {
+        List<BusDeviceInfo> busDeviceInfos = deviceInfoMapper.selectDeviceInfoList1(busDeviceInfo);
+        if (CollectionUtils.isEmpty(busDeviceInfos)) {
+            return new ArrayList<>();
+        }
+        //设备去重，取最新
+        List<BusDeviceInfo> resultList = busDeviceInfos.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> {
+                    return StringUtils.isNotEmpty(o.getDeviceId()) ? o.getDeviceId() : o.getSnCode() ;
+                }))),
+                ArrayList::new)
+        );
+        return resultList;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addDeviceAndAppInfo(AppDeviceAddRequest appDeviceAddRequest) {
+        //重复sn码处理，删除原有的
+        if(StringUtils.isNotEmpty(appDeviceAddRequest.getSnCode())){
+            QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+            wrapper.eq("sn_code", appDeviceAddRequest.getSnCode());
+            deviceInfoMapper.delete(wrapper);
+        }
+
         BusDeviceInfo deviceInfo = new BusDeviceInfo();
         BeanUtils.copyProperties(appDeviceAddRequest, deviceInfo);
         int devInsertFlag = deviceInfoMapper.insert(deviceInfo);
@@ -82,6 +114,9 @@
     public Object deviceUnbind(DeviceUnbindRequest deviceUnbindRequest) {
         //请求涂鸦
         List<String> deviceIds = deviceUnbindRequest.getDeviceIds();
+        if(CollectionUtil.isEmpty(deviceIds)){
+            return ResponseData.error("deviceIds不能为空");
+        }
         List<String> falseList = new ArrayList<>();
         deviceIds.stream().forEach(id -> {
             boolean deleteFlag = tuyaRequest.doDeleteRequest("/v1.0/devices/" + id, null);
@@ -98,7 +133,7 @@
             }
         }
         if (!CollectionUtil.isEmpty(falseList)) {
-            return ResponseData.error("设备:" + falseList + "解绑失败");
+            return ResponseData.error("设备:" + falseList + "解绑失败，该设备为非IOT设备或该设备已解绑");
         }
         return ResponseData.success();
     }
@@ -170,6 +205,10 @@
                     //壁挂炉
                     if (!Objects.isNull(appDeviceDataRequest.getHangingFurnaceInfo())) {
                         insertFlag = hangingFurnaceInfoMapper.insert(appDeviceDataRequest.getHangingFurnaceInfo());
+                    }else
+                        //汉威可燃气体探测器
+                        if(!Objects.isNull(appDeviceDataRequest.getDetectorInfo())){
+                            insertFlag = detectorInfoMapper.insert(appDeviceDataRequest.getDetectorInfo());
                     }
         if(insertFlag > 0){
             return ResponseData.success();
@@ -185,7 +224,9 @@
         BeanUtils.copyProperties(deviceInfo, deviceDetailResponse);
         //获取供应商名称
         BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectById(deviceInfo.getSupplierId());
-        deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        if(!Objects.isNull(busSupplierInfo)){
+            deviceDetailResponse.setSupplierName(busSupplierInfo.getSupplierName());
+        }
         String deviceId = deviceInfo.getDeviceId();
         //涂鸦真实设备处理
         if(StringUtils.isNotEmpty(deviceId)){
@@ -212,6 +253,11 @@
                         BusDeviceHangingFurnaceInfo hangingFurnaceInfo = hangingFurnaceInfoMapper.selectByDeviceId(deviceId);
                         deviceDetailResponse.setBusinessExt(hangingFurnaceInfo);
                         return ResponseData.success(deviceDetailResponse);
+                    case "可燃气体探测器":
+                        //取最新的数据
+                        BusDeviceDetectorInfo detectorInfo = detectorInfoMapper.selectByDeviceId(deviceId);
+                        deviceDetailResponse.setBusinessExt(detectorInfo);
+                        return ResponseData.success(deviceDetailResponse);
                 }
             }
         }
@@ -241,4 +287,17 @@
         response.setOnlineDeviceRatio(result + "%");
         return ResponseData.success(response);
     }
+
+    @Override
+    public BusDeviceInfo getDeviceInfo(String deviceCode) {
+        QueryWrapper<BusDeviceInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("device_id", deviceCode);
+        BusDeviceInfo deviceInfo = deviceInfoMapper.selectOne(wrapper);
+        return deviceInfo;
+    }
+
+    @Override
+    public List<String> getDuplicateSnDevice(List<String> collect) {
+        return deviceInfoMapper.selectDuplicateSnDevice(collect);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
index 55aae90..d40ddbb 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusDistributorInfoServiceImpl.java
@@ -23,6 +23,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -96,24 +97,27 @@
     }
 
     @Override
-    public BusDetailBusiness getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
+    public DetailBusinessResponse getDistributorBusinessDetail(BusDistributorInfo distributorInfo) {
         String distributorCode = distributorInfo.getDistributorCode();
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", distributorCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         BusDetailBusiness detailBusiness = detailBusinessMapper.selectOne(queryWrapper);
         DetailBusinessResponse detailBusinessResponse = new DetailBusinessResponse();
+        if(Objects.isNull(detailBusiness)){
+            return detailBusinessResponse;
+        }
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //经销商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        brandWrapper.eq("merchant_code", distributorCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //经销商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", distributorCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
+        bankWrapper.eq("merchant_code", distributorCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.DISTRIBUTOR_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //经销商资质认证信息
@@ -123,7 +127,7 @@
         List<BusDetailQualifyCertificate> busDetailQualifyCertificates = detailQualifyCertificateMapper.selectList(qualifyWrapper);
         detailBusinessResponse.setQualifyCertificateList(busDetailQualifyCertificates);
 
-        return detailBusiness;
+        return detailBusinessResponse;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
index 1056047..d631141 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusProductInfoServiceImpl.java
@@ -62,15 +62,15 @@
             return new ArrayList<>();
         }
         //一个品牌可以属于多个品类
-        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
-        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
-        if(!CollectionUtils.isEmpty(bcRelations)){
-            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
-            busProductInfos.forEach(productInfo -> {
-                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
-                productInfo.setCategorys(bbcRelations);
-            });
-        }
+//        List<Long> brandIds = busProductInfos.stream().map(BusProductInfo::getBrandId).collect(Collectors.toList());
+//        List<BusBrandCategoryRelation> bcRelations = brandCategoryRelationMapper.selectBatchBrandIds(brandIds);
+//        if(!CollectionUtils.isEmpty(bcRelations)){
+//            Map<Long, List<BusBrandCategoryRelation>> bcRelationMap = bcRelations.stream().collect(Collectors.groupingBy(BusBrandCategoryRelation::getBrandId));
+//            busProductInfos.forEach(productInfo -> {
+//                List<BusBrandCategoryRelation> bbcRelations = bcRelationMap.get(productInfo.getBrandId());
+//                productInfo.setCategorys(bbcRelations);
+//            });
+//        }
         return busProductInfos;
     }
 
@@ -130,8 +130,11 @@
         paramValueList.forEach(value -> {
             value.setProductId(busProductInfo.getId());
         });
-        boolean saParamFlag = paramValueService.saveBatch(paramValueList);
-        if(upProductFlag > 0 && delParamFlag > 0 && saParamFlag){
+        boolean saParamFlag = true;
+        if(!CollectionUtils.isEmpty(paramValueList)){
+            saParamFlag = paramValueService.saveBatch(paramValueList);
+        }
+        if(upProductFlag > 0 && saParamFlag){
             return ResponseData.success();
         }
         return ResponseData.error("更新产品信息失败");
@@ -188,8 +191,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object addServiceBind(AddServiceBindDTO addServiceBindDTO) {
+        //删除原有绑定关系
+        int delFlag = productInfoMapper.deleteByProductId(addServiceBindDTO.getProductId());
         //插入关联表
-        int insertFlag = productInfoMapper.insertServiceBind(addServiceBindDTO);
+        int insertFlag = productInfoMapper.insertBatchServiceBind(addServiceBindDTO);
         if(insertFlag > 0){
             return ResponseData.success();
         }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
index 7b77d71..57d5c98 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusQualifyInfoServiceImpl.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusQualifyInfoMapper;
 import com.casic.missiles.modular.system.model.BusQualifyInfo;
-import com.casic.missiles.modular.system.model.BusSnFixedInfo;
 import com.casic.missiles.modular.system.service.IBusQualifyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +68,9 @@
 
     @Override
     public Object deleteBatchQualifyInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delete = qualifyInfoMapper.deleteBatchIds(ids);
         if(delete >= 0){
             return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
index 28b77e1..ffda3fc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusServiceInfoServiceImpl.java
@@ -2,18 +2,20 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusServiceInfoMapper;
 import com.casic.missiles.modular.system.model.BusServiceInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeInfo;
-import com.casic.missiles.modular.system.model.BusServiceTypeQualifyRelation;
 import com.casic.missiles.modular.system.service.IBusServiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -27,6 +29,8 @@
 public class BusServiceInfoServiceImpl extends ServiceImpl<BusServiceInfoMapper, BusServiceInfo> implements IBusServiceInfoService {
     @Autowired
     private BusServiceInfoMapper busServiceInfoMapper;
+    @Resource
+    private AbstractDictService dictService;
 
     @Override
     public List<BusServiceInfo> getServiceInfoListPage(Page<BusServiceInfo> page, BusServiceInfo busServiceInfo) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
index ce6185e..14040f5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnFixedInfoServiceImpl.java
@@ -23,10 +23,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,35 +75,46 @@
 
             //有前项编码，为编码项增加对应的前项编码
             if(StringUtils.isNotEmpty(itemList.get(0).getDigitPre())){
-                Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                Integer flag = 0;
                 while(iterator.hasNext()){
+                    flag = 1;
                     SnFixedItemDTO snFixedItemDTO = iterator.next();
                     for (SnFixedItemDTO fixedItemDTO : itemList) {
-                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())){
+                        //关联前一项与前一项比较（可能有前一项是组装完成的，比对前项编码说明和编码,组装完成的中包括前项编码名（前端输入保证编码名不重复））
+                        if(fixedItemDTO.getDigitPre().equals(snFixedItemDTO.getDigitItem())
+                                || (snFixedItemDTO.getDigitItem().substring(snFixedItemDTO.getDigitItem().length()-1).equals(fixedItemDTO.getDigitPre()))
+                                && snFixedItemDTO.getDigitItemIllustration().equals(fixedItemDTO.getDigitPreIllustration())){
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
                     }
-                    snFixedItemList.remove(snFixedItemDTO);
+                }
+                if(flag == 1){
+                    snFixedItemList.remove(0);
                 }
             }else if(StringUtils.isEmpty(itemList.get(0).getDigitPre())){
                 //无前项编码，为每一项增加上一位的编码项
                 //不是第1项
                 if(!CollectionUtils.isEmpty(snFixedItemList)){
-                    Iterator<SnFixedItemDTO> iterator = snFixedItemList.iterator();
+                    ListIterator<SnFixedItemDTO> iterator = snFixedItemList.listIterator();
+                    Integer flag = 0;
                     while(iterator.hasNext()){
+                        flag = 1;
                         SnFixedItemDTO snFixedItemDTO = iterator.next();
                         for (SnFixedItemDTO fixedItemDTO : itemList) {
                             SnFixedItemDTO snFixedItemDTO1 = new SnFixedItemDTO();
                             BeanUtils.copyProperties(snFixedItemDTO, snFixedItemDTO1);
                             snFixedItemDTO1.setDigitItem(snFixedItemDTO1.getDigitItem() + fixedItemDTO.getDigitItem());
                             snFixedItemDTO1.setDigitItemIllustration(snFixedItemDTO1.getDigitItemIllustration() + fixedItemDTO.getDigitItemIllustration());
-                            snFixedItemList.add(snFixedItemDTO1);
+                            iterator.add(snFixedItemDTO1);
                         }
-                        snFixedItemList.remove(snFixedItemDTO);
+                    }
+                    if(flag == 1){
+                        snFixedItemList.remove(0);
                     }
                 }else{
                     //第一项
@@ -113,6 +122,9 @@
                 }
             }
         }
+        //过滤掉位数小于snQuantity的
+        snFixedItemList = snFixedItemList.stream().filter(s -> s.getDigitItem().length() == snQuantity).collect(Collectors.toList());
+
         //批量插入到bus_sn_fixed_info
         List<BusSnFixedInfo> snFixedList = new ArrayList<>();
         for (SnFixedItemDTO snFixedItemDTO : snFixedItemList) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
index 5d588f3..baaca8d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSnInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.shiro.ShiroKit;
@@ -21,7 +20,9 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,9 +55,8 @@
     public Object addSnInfo(SnInfoOperateRequest request) {
         //供应商登录用户名
         String account = String.valueOf(ShiroKit.getSession().getAttribute("username"));
-        QueryWrapper<BusSupplierInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("supplier_account", account);
-        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectOne(wrapper);
+        account = "gys1";
+        BusSupplierInfo busSupplierInfo = supplierInfoMapper.selectNewest(account);
         Integer snStartCode = Integer.valueOf(request.getSnStartCode());
         Integer snEndCode = Integer.valueOf(request.getSnEndCode());
         if(Integer.valueOf(snEndCode) < Integer.valueOf(snStartCode)){
@@ -65,7 +65,7 @@
         //新增至bus_sn_info
         BusSnInfo busSnInfo = new BusSnInfo();
         BeanUtils.copyProperties(request, busSnInfo);
-        int insertFlag = snInfoMapper.insert(busSnInfo);
+
         List<BusDeviceInfo> deviceInfos = new ArrayList<>();
         //解析sn码，批量新增至bus_device_info
         while(Integer.valueOf(snStartCode) <= Integer.valueOf(snEndCode)){
@@ -76,9 +76,31 @@
             deviceInfos.add(deviceInfo);
             snStartCode += 1;
         }
+        //重复数据处理，重复数据不生成，给出提示“您生成的设备数据与已有设备数据重复，部分生成失败”
+        List<String> collect = deviceInfos.stream().map(BusDeviceInfo::getSnCode).collect(Collectors.toList());
+        List<String> list = deviceInfoService.getDuplicateSnDevice(collect);
+        if(!CollectionUtils.isEmpty(list)){
+            Iterator<BusDeviceInfo> iterator = deviceInfos.iterator();
+            while(iterator.hasNext()){
+                BusDeviceInfo next = iterator.next();
+                if(list.contains(next.getSnCode())){
+                    iterator.remove();
+                }
+            }
+        }
+
         boolean saveFlag = deviceInfoService.saveBatch(deviceInfos);
-        if(insertFlag > 0 && saveFlag){
-            return ResponseData.success(deviceInfos);
+        if(saveFlag){
+            int insertFlag = snInfoMapper.insert(busSnInfo);
+            if(!CollectionUtils.isEmpty(list) && insertFlag > 0){
+                return ResponseData.error("您生成的设备数据与已有设备数据重复，部分生成失败");
+            }
+            if(insertFlag > 0){
+                return ResponseData.success(deviceInfos);
+            }
+        }
+        if(!CollectionUtils.isEmpty(list) && !saveFlag){
+            return ResponseData.error("您生成的设备数据与已有设备数据重复，全部生成失败");
         }
         return ResponseData.error("新增SN码失败");
     }
@@ -97,6 +119,9 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteBatchSnInfo(List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return ResponseData.error("请选择删除项");
+        }
         int delSnInfoFlag = snInfoMapper.deleteBatchIds(ids);
         // TODO: 2022/9/9  删除snInfo是否要删除生成的所有设备
         if(delSnInfoFlag >= 0){
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
index 53f7ab9..e0dd5e4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierAnnualAssessServiceImpl.java
@@ -1,10 +1,10 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.BusSupplierAnnualAssessMapper;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess;
 import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierAnnualAssessServiceImpl extends ServiceImpl<BusSupplierAnnualAssessMapper, BusSupplierAnnualAssess> implements IBusSupplierAnnualAssessService {
     @Autowired
     private BusSupplierAnnualAssessMapper annualAssessMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(Page<BusSupplierAnnualAssess> page, BusSupplierAnnualAssess annualAssess) {
+    public List<BusSupplierAnnualAssess> getAnnualAssessInfoListPage(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
-        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(page, annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessListPage(annualAssess);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -58,7 +63,7 @@
     public List<BusSupplierAnnualAssess> getAnnualAssessInfoList(BusSupplierAnnualAssess annualAssess) {
         //只查bus_supplier_annual_assess表即可
         List<BusSupplierAnnualAssess> list = annualAssessMapper.selectAnnualAssessList(annualAssess);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的年度考核
         List<BusSupplierAnnualAssess> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierAnnualAssess::getSupplierCode))),
@@ -97,7 +102,8 @@
 //        String filePath = fileService.saveFile(file);
 //        annualAssess.setAnnualAssessFile(filePath);
         int insertAnnualAssessFlag = annualAssessMapper.insert(annualAssess);
-        if (insertAnnualAssessFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByAssess(annualAssess);
+        if (insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("年度考核添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
index 043a0e5..be4e0b8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInfoServiceImpl.java
@@ -58,6 +58,8 @@
     private IBusDetailQualifyCertificateService detailQualifyCertificateService;
     @Autowired
     private IBusDetailBankService detailBankService;
+    @Autowired
+    private BusSupplierPreReviewMapper preReviewMapper;
 
 
     @Override
@@ -104,7 +106,7 @@
     }
 
     @Override
-    public BusDetailBusiness getSupplierBusinessDetail(String supplierCode) {
+    public DetailBusinessResponse getSupplierBusinessDetail(String supplierCode) {
         QueryWrapper<BusDetailBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("merchant_code", supplierCode);
         queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
@@ -113,14 +115,14 @@
         BeanUtils.copyProperties(detailBusiness, detailBusinessResponse);
         //供应商品牌信息
         QueryWrapper<BusDetailBrand> brandWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        brandWrapper.eq("merchant_code", supplierCode);
+        brandWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBrand> busDetailBrands = detailBrandMapper.selectList(brandWrapper);
         detailBusinessResponse.setBrandList(busDetailBrands);
         //供应商银行账户信息
         QueryWrapper<BusDetailBank> bankWrapper = new QueryWrapper<>();
-        queryWrapper.eq("merchant_code", supplierCode);
-        queryWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
+        bankWrapper.eq("merchant_code", supplierCode);
+        bankWrapper.eq("merchant_type", MerchantTypeEnum.SUPPLIER_TYPE);
         List<BusDetailBank> busDetailBanks = detailBankMapper.selectList(bankWrapper);
         detailBusinessResponse.setBankList(busDetailBanks);
         //供应商资质认证信息
@@ -145,11 +147,20 @@
         QueryWrapper<BusSupplierQuarterlyEvaluate> evaluateWrapper = new QueryWrapper<>();
         evaluateWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierQuarterlyEvaluate> busSupplierQuarterlyEvaluates = quarterlyEvaluateMapper.selectList(evaluateWrapper);
+        busSupplierQuarterlyEvaluates.forEach(ann -> {
+            ann.setEvaluateYearName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getEvaluateYear()));
+            ann.setEvaluateQuarterlyName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_QUARTERLY, ann.getEvaluateQuarterly()));
+            ann.setQuarterlyEvaluateResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getQuarterlyEvaluateResult()));
+        });
         detailResponse.setQuarterlyEvaluateList(busSupplierQuarterlyEvaluates);
         //bus_supplier_annual_assess表获取历史年度考核
         QueryWrapper<BusSupplierAnnualAssess> assessWrapper = new QueryWrapper<>();
         assessWrapper.eq("supplier_code", supplierCode);
         List<BusSupplierAnnualAssess> busSupplierAnnualAssesses = annualAssessMapper.selectList(assessWrapper);
+        busSupplierAnnualAssesses.forEach(ann -> {
+            ann.setAnnualAssessResultName(dictService.getDictNameByCode(SmartKitchenDict.EVALUATE_RESULT, ann.getAnnualAssessResult()));
+            ann.setAssessAnnualName(dictService.getDictNameByCode(SmartKitchenDict.ASSESS_ANNUAL, ann.getAssessAnnual()));
+        });
         detailResponse.setAnnualAssessList(busSupplierAnnualAssesses);
         return detailResponse;
     }
@@ -167,6 +178,12 @@
         baseInfo.setSupplierStatus("2");//供应商状态首次添加为审核中
         baseInfo.setSupplierAccount(account);
         int insertBaseFlag = supplierInfoMapper.insert(baseInfo);
+        //预审信息
+        BusSupplierPreReview pre = new BusSupplierPreReview();
+        pre.setSupplierCode(supplierCode);
+        pre.setSupplierName(baseInfo.getSupplierName());
+        pre.setSupplierStatus("2");
+        int insertPreFlag = preReviewMapper.insert(pre);
         //三证信息
         BusDetailCertificate certificateInfo = supplierInfoAddRequest.getCertificateInfo();
         certificateInfo.setMerchantType(MerchantTypeEnum.SUPPLIER_TYPE);
@@ -203,7 +220,7 @@
             busDetailQualifyCertificate.setMerchantCode(supplierCode);
         });
         boolean saveQualifyFlag = detailQualifyCertificateService.saveBatch(busDetailQualifyCertificates);
-        if(insertBaseFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
+        if(insertBaseFlag > 0 && insertPreFlag > 0 && insertCertFlag > 0 && insertPersonFlag > 0 && insertBusFlag > 0){
             return ResponseData.success();
         }
         return ResponseData.error("信息填报失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
index 0dd41b9..51af807 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierInputReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -20,7 +19,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +49,10 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierInputReview> getInputReviewInfoListPage(Page<BusSupplierInputReview> page, BusSupplierInputReview inputReview) {
+    public List<BusSupplierInputReview> getInputReviewInfoListPage(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
-        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(page, inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewListPage(inputReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -70,7 +72,7 @@
     public List<BusSupplierInputReview> getInputReviewInfoList(BusSupplierInputReview inputReview) {
         //只查询录库评审表，预审通过的才会加到录库评审中
         List<BusSupplierInputReview> list = inputReviewMapper.selectInputReviewList(inputReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的录库评审记录
         List<BusSupplierInputReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierInputReview::getSupplierCode))),
@@ -126,7 +128,7 @@
         }
         //录库评审不通过，更新主表bus_supplier_info状态及最新预审结果
         int updateFlag = 1;
-        if ("3".equals(inputReview.getInputReviewResult())) {
+        if ("4".equals(inputReview.getInputReviewResult())) {
             updateFlag = supplierInfoMapper.updateStatusByInputView(inputReview);
         }
         if (insertQuarterlyFlag > 0 && insertInputFlag > 0 && updateFlag > 0 && insertAnnualAssessFlag > 0 && updateInfoFlag > 0) {
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
index 4a15c4a..4778bd1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierPreReviewServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
@@ -18,7 +17,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -43,10 +45,9 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierPreReview> getPreReviewInfoListPage(Page<BusSupplierPreReview> page, BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
-        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(page, preReview);
-        Collections.reverse(list);//反转为后面去重使用
+    public List<BusSupplierPreReview> getPreReviewInfoListPage(BusSupplierPreReview preReview) {
+        List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewListPage(preReview);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
@@ -64,9 +65,8 @@
 
     @Override
     public List<BusSupplierPreReview> getPreReviewInfoList(BusSupplierPreReview preReview) {
-        //bus_supplier_info作为主表，bus_supplier_info表记录所有最新的评审信息，无评审信息时也会有供应商基础信息
         List<BusSupplierPreReview> list = preReviewMapper.selectPreReviewList(preReview);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierPreReview> resultList = list.stream().collect(Collectors.collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierPreReview::getSupplierCode))),
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
index 81caf19..24583e5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusSupplierQuarterlyEvaluateServiceImpl.java
@@ -1,9 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.BusSupplierInfoMapper;
 import com.casic.missiles.modular.system.dao.BusSupplierQuarterlyEvaluateMapper;
 import com.casic.missiles.modular.system.enums.SmartKitchenDict;
 import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate;
@@ -14,7 +14,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -29,14 +32,16 @@
 public class BusSupplierQuarterlyEvaluateServiceImpl extends ServiceImpl<BusSupplierQuarterlyEvaluateMapper, BusSupplierQuarterlyEvaluate> implements IBusSupplierQuarterlyEvaluateService {
     @Autowired
     private BusSupplierQuarterlyEvaluateMapper quarterlyEvaluateMapper;
+    @Autowired
+    private BusSupplierInfoMapper supplierInfoMapper;
     @Resource
     private AbstractDictService dictService;
 
     @Override
-    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(Page<BusSupplierQuarterlyEvaluate> page, BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
+    public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoListPage(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
-        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(page, quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+        List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateListPage(quarterlyEvaluate);
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的评价记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -59,7 +64,7 @@
     public List<BusSupplierQuarterlyEvaluate> getQuarterlyEvaluateInfoList(BusSupplierQuarterlyEvaluate quarterlyEvaluate) {
         //只查bus_supplier_quarterly_evaluate表即可
         List<BusSupplierQuarterlyEvaluate> list = quarterlyEvaluateMapper.selectQuarterEvaluateList(quarterlyEvaluate);
-        Collections.reverse(list);//反转为后面去重使用
+//        Collections.reverse(list);//反转为后面去重使用
         //只取每个供应商最新的预审记录
         List<BusSupplierQuarterlyEvaluate> resultList = list.stream().collect(Collectors.collectingAndThen(
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BusSupplierQuarterlyEvaluate::getSupplierCode))),
@@ -100,7 +105,8 @@
 //        String filePath = fileService.saveFile(file);
 //        quarterlyEvaluate.setQuarterlyEvaluateFile(filePath);
         int insertEvaluateFlag = quarterlyEvaluateMapper.insert(quarterlyEvaluate);
-        if (insertEvaluateFlag > 0) {
+        int updateInfoFlag = supplierInfoMapper.updateStatusByEvaluate(quarterlyEvaluate);
+        if (insertEvaluateFlag > 0 && updateInfoFlag > 0) {
             return ResponseData.success();
         }
         return ResponseData.error("季度评价添加失败");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
index 403db52..2e45dd4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticDeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.service.StatisticDeviceService;
 import com.casic.missiles.modular.system.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,26 +48,31 @@
         if(list.size() > 50){
             deviceInfos = list.subList(0, 50);
         }
-        String deviceIdsStr = deviceInfos.stream().map(BusDeviceInfo::getDeviceId).collect(Collectors.joining(","));
+        //过滤掉汉威的设备（汉威设备有图片）
+        String deviceIdsStr = deviceInfos.stream().filter(d -> StringUtils.isEmpty(d.getPicUri())).filter(d -> 1==d.getIotDevice())
+                .map(BusDeviceInfo::getDeviceId).distinct().collect(Collectors.joining(","));
         HashMap<String, String> params = new HashMap<>();
         params.put("device_ids", deviceIdsStr);
         boolean getFlag = tuyaRequest.doGetRequest("/v2.0/iot-01/tracks/location", params, null);
         List<DevicePosDTO> devicePosDTOS = new ArrayList<>();
         if (!getFlag) {
             log.info("调用涂鸦，批量查询设备实时位置接口失败，deviceIds：{}，error：{}", deviceIdsStr, tuyaRequest.getError());
-        } else {
-            JSONArray result = (JSONArray) tuyaRequest.getResult();
-            result.stream().forEach(dto -> {
-                JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
-                String deviceId = jsonDTO.getString("device_id");
-                Double lon = jsonDTO.getDouble("lon");
-                Double lat = jsonDTO.getDouble("lat");
-                DevicePosDTO devicePosDTO = new DevicePosDTO();
-                devicePosDTO.setDeviceId(deviceId);
-                devicePosDTO.setLon(lon);
-                devicePosDTO.setLat(lat);
-                devicePosDTOS.add(devicePosDTO);
-            });
+        } else if(tuyaRequest.getResult() != null){
+            JSONObject results = (JSONObject) tuyaRequest.getResult();
+            JSONArray result = results.getJSONArray("device_location_list");
+            if(0 != result.size()){
+                result.stream().forEach(dto -> {
+                    JSONObject jsonDTO = (JSONObject) JSON.toJSON(dto);
+                    String deviceId = jsonDTO.getString("device_id");
+                    Double lon = jsonDTO.getDouble("lon");
+                    Double lat = jsonDTO.getDouble("lat");
+                    DevicePosDTO devicePosDTO = new DevicePosDTO();
+                    devicePosDTO.setDeviceId(deviceId);
+                    devicePosDTO.setLon(lon);
+                    devicePosDTO.setLat(lat);
+                    devicePosDTOS.add(devicePosDTO);
+                });
+            }
         }
         ArrayList<DeviceListResponse> resultList = new ArrayList<>();
         list.forEach(device -> {
@@ -134,9 +140,11 @@
                 }
             }
             for (DeviceCountForMonthDTO2 dto : list2) {
-                DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
-                if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
-                    activeDevice += dto.getDeviceCount();
+                if(!StringUtils.isEmpty(dto.getDate())){
+                    DateTime dtoDateTime = DateUtil.parseDate(dto.getDate());
+                    if(DateUtil.compare(dateTime, dtoDateTime) >= 0){
+                        activeDevice += dto.getDeviceCount();
+                    }
                 }
             }
             HashMap<String, String> resultMap = new HashMap<>();
@@ -153,7 +161,7 @@
     @Override
     public List<DeviceCategoryGroupDTO> deviceCategory() {
         List<DeviceCategoryGroupDTO> list = deviceInfoMapper.selectListGroupByCategory();
-        return list;
+        return list.stream().filter(device -> device.getDeviceCount()!=0).collect(Collectors.toList());
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
index e567fd3..5482ba8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticManageServiceImpl.java
@@ -34,8 +34,53 @@
     @Override
     public List<UserGroupDTO> userCount() {
         //按角色分组统计人数
-        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
-        return list;
+//        List<UserGroupDTO> list = statisticManageMapper.selectUserGroupByRole();
+        //查询出所有用户roleId及对应数量
+        List<UserRoleIdGroupDTO> roleIdList = statisticManageMapper.selectUserGroupByRoleId();
+        List<UserRoleIdGroupDTO> dtoList = new ArrayList<>();
+        Iterator<UserRoleIdGroupDTO> iterator = roleIdList.iterator();
+        while(iterator.hasNext()){
+            UserRoleIdGroupDTO role = iterator.next();
+            if(role.getRoleId().contains(",")){
+                String[] split = role.getRoleId().split(",");
+                List<String> list1 = Arrays.asList(split);
+                list1.forEach(l -> {
+                    UserRoleIdGroupDTO userRoleIdGroupDTO = new UserRoleIdGroupDTO();
+                    userRoleIdGroupDTO.setRoleId(l);
+                    userRoleIdGroupDTO.setUserCount(role.getUserCount());
+                    dtoList.add(userRoleIdGroupDTO);
+                });
+                iterator.remove();
+            }
+        }
+
+        if(!CollectionUtils.isEmpty(dtoList)){
+            roleIdList.addAll(dtoList);
+        }
+        List<String> ids = roleIdList.stream().map(UserRoleIdGroupDTO::getRoleId).collect(Collectors.toList());
+        List<UserRoleNameDTO> list = statisticManageMapper.selectNameById(ids);
+        Map<String, List<UserRoleNameDTO>> collect1 = list.stream().collect(Collectors.groupingBy(UserRoleNameDTO::getRoleId));
+        Map<String, List<UserRoleIdGroupDTO>> collect = roleIdList.stream().collect(Collectors.groupingBy(UserRoleIdGroupDTO::getRoleId));
+
+        List<UserGroupDTO> resultList = new ArrayList<>();
+        collect.keySet().forEach(key -> {
+            UserGroupDTO userGroupDTO = new UserGroupDTO();
+            List<UserRoleIdGroupDTO> userRoleIdGroupDTOS = collect.get(key);
+            if(userRoleIdGroupDTOS.size() == 1){
+                UserRoleIdGroupDTO userRoleIdGroupDTO = userRoleIdGroupDTOS.get(0);
+                userGroupDTO.setUserCount(userRoleIdGroupDTO.getUserCount());
+            }else if(userRoleIdGroupDTOS.size() > 1){
+                int sum = userRoleIdGroupDTOS.stream().mapToInt(UserRoleIdGroupDTO::getUserCount).sum();
+                userGroupDTO.setUserCount(sum);
+            }
+            if(!CollectionUtils.isEmpty(collect1.get(key))){
+                userGroupDTO.setRoleName(collect1.get(key).get(0).getRoleName());
+                resultList.add(userGroupDTO);
+            }
+        });
+
+
+        return resultList;
     }
 
     @Override
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b07c1ec..19eba3d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.casic</groupId>
-        <artifactId>casic-template</artifactId>
+        <artifactId>casic-smart-kitchen</artifactId>
         <relativePath>../pom.xml</relativePath>
         <version>2.0.0</version>
     </parent>
@@ -141,6 +141,11 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${maven.assembly.plugin.version}</version>
                 <executions>
diff --git a/casic-web/src/main/build/bin/deploy.sh b/casic-web/src/main/build/bin/deploy.sh
new file mode 100644
index 0000000..f774749
--- /dev/null
+++ b/casic-web/src/main/build/bin/deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+ID=`lsof -i | grep 5903 | awk '{print $2}'`
+echo The process pid is $ID
+for id in $ID
+do
+    kill -9 $id
+    echo killed $id
+done
+cd /home/admin/app/wangpeng/smartkitchen/casic-web-2.0.0/
+nohup java -jar ./lib/casic-web-2.0.0.jar > /dev/null 2>&1 &
+exit 0
\ No newline at end of file
diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh
index c00b1ef..562149f 100644
--- a/casic-web/src/main/build/bin/start.sh
+++ b/casic-web/src/main/build/bin/start.sh
@@ -1,2 +1 @@
-java -jar ./lib/${project.build.finalName}.jar
-
+java -jar ./lib/${project.build.finalName}.jar
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index c45059a..71f5a17 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -32,7 +32,7 @@
 #   redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
 casic:
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
+  no-login-urls: /**/**,${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/register,/user/sms/**,/appRecommendInfo/**,/appBannerInfo/**,/demo/**,/miniUser/**,/**/mini/**
   #flowable数据源和多数据源配置
   db:
     init:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 4257032..5ac56ad 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -7,8 +7,8 @@
     active: dev
   servlet:
     multipart:
-      max-file-size: 50MB
-      max-request-size: 80MB
+      max-file-size: 100MB
+      max-request-size: 100MB
 #mybatis-plus:
 #    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
 ###################  mybatis-plus配置  ###################
diff --git a/pom.xml b/pom.xml
index 6dd9f52..9a39187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
          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>
     <groupId>com.casic</groupId>
-    <artifactId>casic-template</artifactId>
+    <artifactId>casic-smart-kitchen</artifactId>
     <version>2.0.0</version>
-    <name>casic-template</name>
+    <name>casic-smart-kitchen</name>
     <packaging>pom</packaging>
     <modules>
         <module>casic-web</module>